From 4879b7b93eaff1f80056d78e19271d6418ec6534 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 14 Jun 2011 02:43:55 +0200
Subject: Display open games correctly

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

(limited to 'src/jrummikub/control/network/NetworkControl.java')

diff --git a/src/jrummikub/control/network/NetworkControl.java b/src/jrummikub/control/network/NetworkControl.java
index e09cdc0..7435839 100644
--- a/src/jrummikub/control/network/NetworkControl.java
+++ b/src/jrummikub/control/network/NetworkControl.java
@@ -34,9 +34,9 @@ public class NetworkControl {
 	 * Creates a new network control
 	 * 
 	 * @param loginData
-	 *            user's login data
+	 *          user's login data
 	 * @param view
-	 *            for events and handlers
+	 *          for events and handlers
 	 */
 	public NetworkControl(final LoginData loginData, final IView view) {
 		this.view = view;
@@ -75,21 +75,19 @@ public class NetworkControl {
 	 * Adds the listeners for connection control events
 	 * 
 	 * @param loginData
-	 *            player's login data
+	 *          player's login data
 	 * @param view
-	 *            view for events
+	 *          view for events
 	 */
 	public void addConnectionControlListeners(final LoginData loginData,
 			final IView view) {
-		connections.add(connectionControl.getConnectedEvent().add(
-				new IListener() {
-					@Override
-					public void handle() {
-						view.getGameListPanel().setChannelName(
-								loginData.getChannelName());
-						view.showGameListPanel(true);
-					}
-				}));
+		connections.add(connectionControl.getConnectedEvent().add(new IListener() {
+			@Override
+			public void handle() {
+				view.getGameListPanel().setChannelName(loginData.getChannelName());
+				view.showGameListPanel(true);
+			}
+		}));
 
 		connections.add(connectionControl.getConnectionFailedEvent().add(
 				new IListener() {
@@ -144,8 +142,16 @@ public class NetworkControl {
 		for (Connection c : connections) {
 			c.remove();
 		}
-		connectionControl.disconnect();
 		view.showGameListPanel(false);
+
+		if (settingsControl != null) {
+			settingsControl.abort();
+		}
+		if (gameOfferControl != null) {
+			gameOfferControl.abort();
+		}
+
+		connectionControl.disconnect();
 	}
 
 	/**
-- 
cgit v1.2.3