Fix connecting to servers when selected in the GUI

1 files changed, 4 insertions, 2 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 90e31f5a..e587e28e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -908,6 +908,10 @@ int main(int argc, char *argv[])
 
             state = STATE_GAME;
         }
+        else if (state == STATE_CONNECT_SERVER && oldstate == STATE_CHOOSE_SERVER)
+        {
+            Net::connectToServer(currentServer);
+        }
         else if (state == STATE_CONNECT_SERVER &&
                  oldstate != STATE_CHOOSE_SERVER &&
                  Net::getLoginHandler()->isConnected())
@@ -955,8 +959,6 @@ int main(int argc, char *argv[])
                     } else {
                         state = STATE_CONNECT_SERVER;
 
-                        Net::connectToServer(currentServer);
-
                         // Reset options so that cancelling or connect
                         // timeout will show the server dialog.
                         options.serverName.clear();