1 files changed, 7 insertions, 7 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 5308304f..73752c9e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -835,13 +835,6 @@ int main(int argc, char *argv[])
                     break;
 
                 case SDL_KEYDOWN:
-                    if (event.key.keysym.sym == SDLK_ESCAPE)
-                    {
-                        if (!quitDialog)
-                            quitDialog = new QuitDialog(&quitDialog);
-                        else
-                            quitDialog->requestMoveToTop();
-                    }
                     break;
             }
 
@@ -881,6 +874,13 @@ int main(int argc, char *argv[])
             Net::getCharHandler()->setCharInfo(&charInfo);
             state = STATE_LOGIN;
         }
+        else if (state == STATE_WORLD_SELECT && oldstate == STATE_UPDATE)
+        {
+            if (Net::getLoginHandler()->getWorlds().size() < 2)
+            {
+                state = STATE_LOGIN;
+            }
+        }
         else if (oldstate == STATE_START || oldstate == STATE_GAME)
         {
             desktop = new Desktop;