From d59f0eb27a674e0b6dc821771a40adbd39f4c3e2 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 21 Jun 2011 04:42:34 +0200
Subject: Correctly abort network games

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@541 72836036-5685-4462-b002-a69064685172
---
 src/jrummikub/control/network/NetworkControl.java | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/jrummikub/control/network')

diff --git a/src/jrummikub/control/network/NetworkControl.java b/src/jrummikub/control/network/NetworkControl.java
index 4c03923..88f347c 100644
--- a/src/jrummikub/control/network/NetworkControl.java
+++ b/src/jrummikub/control/network/NetworkControl.java
@@ -240,12 +240,19 @@ public class NetworkControl {
 
 		if (settingsControl != null) {
 			settingsControl.abort();
+			settingsControl = null;
 		}
 		if (gameOfferControl != null) {
 			gameOfferControl.abort();
+			gameOfferControl = null;
 		}
 		if (gameJoinControl != null) {
 			gameJoinControl.abort();
+			gameJoinControl = null;
+		}
+		if (gameControl !=  null) {
+			gameControl.abortGame();
+			gameControl = null;
 		}
 
 		connectionControl.disconnect();
-- 
cgit v1.2.3