diff options
Diffstat (limited to 'src/jrummikub/control/network/NetworkControl.java')
| -rw-r--r-- | src/jrummikub/control/network/NetworkControl.java | 34 |
1 files changed, 20 insertions, 14 deletions
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(); } /** |