2 files changed, 5 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 16a5cb1c..459037ef 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -869,10 +869,6 @@ int main(int argc, char *argv[])
                  Net::getGameHandler()->isConnected())
         {
             Net::getLoginHandler()->disconnect();
-
-#ifdef MANASERV_SUPPORT
-            state = STATE_GAME;
-#endif
         }
         else if (state == STATE_CONNECT_SERVER && oldstate == STATE_CHOOSE_SERVER)
         {
diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp
index 615abc51..4a0339b4 100644
--- a/src/net/manaserv/loginhandler.cpp
+++ b/src/net/manaserv/loginhandler.cpp
@@ -301,6 +301,11 @@ bool LoginHandler::isConnected()
 void LoginHandler::disconnect()
 {
     accountServerConnection->disconnect();
+
+    if (state == STATE_CONNECT_GAME)
+    {
+        state = STATE_GAME;
+    }
 }
 
 void LoginHandler::loginAccount(LoginData *loginData)