summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/control/network
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-06-21 04:42:34 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-06-21 04:42:34 +0200
commitd59f0eb27a674e0b6dc821771a40adbd39f4c3e2 (patch)
treee54ac0f490cbfc304f4781b990cc1fc49cc250d4 /src/jrummikub/control/network
parent853f29536aa37e2dc4ab67cd1091cbc85594b9f9 (diff)
downloadJRummikub-d59f0eb27a674e0b6dc821771a40adbd39f4c3e2.tar
JRummikub-d59f0eb27a674e0b6dc821771a40adbd39f4c3e2.zip
Correctly abort network games
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@541 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/control/network')
-rw-r--r--src/jrummikub/control/network/NetworkControl.java7
1 files changed, 7 insertions, 0 deletions
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();