Don't permit to open inventory is playerCAO isn't present. This prevent to open an...

diff --git a/src/game.cpp b/src/game.cpp
index a1e2b807a28ce86aecfa1956d0f727491f7864ee..186e283adb1478dfabbc0ac46f4a8342054cbaed 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2669,6 +2669,15 @@ void Game::dropSelectedItem()
 
 void Game::openInventory()
 {
+       /*
+        * Don't permit to open inventory is CAO or player doesn't exists.
+        * This prevent showing an empty inventory at player load
+        */
+
+       LocalPlayer *player = client->getEnv().getLocalPlayer();
+       if (player == NULL || player->getCAO() == NULL)
+               return;
+
        infostream << "the_game: " << "Launching inventory" << std::endl;
 
        PlayerInventoryFormSource *fs_src = new PlayerInventoryFormSource(client);