Better fix for login screen

src/main.cpp

@@ -1746,10 +1746,12 @@ int main(int argc, char *argv[] )
             // so we immediately start the main menu (unless it was requested
             // to always show the login screen). Otherwise show the login
             // screen first.
-            MainMenuScreen::getInstance()->push();
+            if(PlayerManager::getCurrentPlayer() && !
-
-            if (!PlayerManager::getCurrentPlayer() ||
                 UserConfigParams::m_always_show_login_screen)
+            {
+                MainMenuScreen::getInstance()->push();
+            }
+            else
             {
                 UserScreen::getInstance()->push();
                 // If there is no player, push the RegisterScreen on top of

src/states_screens/user_screen.cpp

@@ -406,7 +406,14 @@ void BaseUserScreen::eventCallback(Widget* widget,
  */
 void BaseUserScreen::closeScreen()
 {
-    StateManager::get()->popMenu();
+    if (StateManager::get()->getMenuStackSize() > 1)
+    {
+        StateManager::get()->popMenu();
+    }
+    else
+    {
+        StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
+    }
 }   // closeScreen
 
 // ----------------------------------------------------------------------------