Fix crash when deleting the current player (also prevent the user from

deleting the last user, since STK (after login) needs a current player).

src/config/player_manager.cpp

@@ -366,6 +366,20 @@ void PlayerManager::addDefaultPlayer()
     m_all_players.push_back(new Online::OnlinePlayerProfile(_LTR("Guest"), /*guest*/true));
 }   // addDefaultPlayer
 
+// ----------------------------------------------------------------------------
+/** Returns the number of 'real' (non-guest) players.
+ */
+unsigned int PlayerManager::getNumNonGuestPlayers() const
+{
+    unsigned int count=0;
+    const PlayerProfile *player;
+    for_in(player, m_all_players)
+    {
+        if(!player->isGuestAccount()) count ++;
+    }
+    return count;
+}   // getNumNonGuestPlayers
+
 // ----------------------------------------------------------------------------
 /** This returns a unique id. This is 1 + largest id used so far.
  */

src/config/player_manager.hpp

@@ -96,6 +96,7 @@ class PlayerManager : public NoCopy
     void setCurrentPlayer(PlayerProfile *player);
     const PlayerProfile *getPlayerById(unsigned int id);
     void enforceCurrentPlayer();
+    unsigned int getNumNonGuestPlayers() const;
     static void setUserDetails(Online::HTTPRequest *request,
                                const std::string &action,
                                const std::string &php_name = "");

src/states_screens/user_screen.cpp

@@ -483,6 +483,15 @@ void BaseUserScreen::newUserAdded(const irr::core::stringw &local_name,
  */
 void BaseUserScreen::deletePlayer()
 {
+    // Check that there is at least one player left: we need to have a
+    // valid current player, so the last player can not be deleted.
+    if(PlayerManager::get()->getNumNonGuestPlayers()==1)
+    {
+        m_info_widget->setText("You can't delete the only player.", true);
+        m_info_widget->setErrorColor();
+        return;
+    }
+
     PlayerProfile *player = getSelectedPlayer();
     irr::core::stringw message =
         //I18N: In the player info dialog (when deleting)
@@ -517,6 +526,21 @@ void BaseUserScreen::doDeletePlayer()
     PlayerProfile *player = getSelectedPlayer();
     PlayerManager::get()->deletePlayer(player);
     GUIEngine::ModalDialog::dismiss();
+
+    // Special case: the current player was deleted. We have to make sure
+    // that there is still a current player (all of STK depends on that).
+    if(!PlayerManager::getCurrentPlayer())
+    {
+        for(unsigned int i=0; i<PlayerManager::get()->getNumPlayers(); i++)
+        {
+            PlayerProfile *player = PlayerManager::get()->getPlayer(i);
+            if(!player->isGuestAccount()) 
+            {
+                PlayerManager::get()->setCurrentPlayer(player);
+                break;
+            }
+        }
+    }
     init();
 }   // doDeletePlayer