From c5069e1d84c892f6eea0c844979e00f71af5b81a Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Sun, 23 Mar 2014 23:48:14 +0200
Subject: [PATCH] Fix menu processing

---
 src/com/annimon/turrets/MenuPanel.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/annimon/turrets/MenuPanel.java b/src/com/annimon/turrets/MenuPanel.java
index 432ab4c..f028bfa 100644
--- a/src/com/annimon/turrets/MenuPanel.java
+++ b/src/com/annimon/turrets/MenuPanel.java
@@ -72,12 +72,15 @@ public class MenuPanel extends JPanel {
             Sound.CLICK.play();
             
             final int index = menuList.getSelectedIndex();
+            menuList.removeSelectionInterval(index, index);
             switch (index) {
                 case 0: // Create server
                 case 1: // Join client
-                    menuList.removeSelectionInterval(0, 1);
-                    GameCanvas canvas = new GameCanvas(index == 0);
-                    canvas.setServerAddress(Prefs.getInstance().lastIp());
+                    final boolean server = (index == 0);
+                    GameCanvas canvas = new GameCanvas(server);
+                    if (!server) {
+                        canvas.setServerAddress(Prefs.getInstance().lastIp());
+                    }
                     Main.getInstance().switchLayout(canvas);
                     new Thread(canvas).start();
                     break;