games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Merge pull request #5693 from kdmcser/crash_fix

Browse Source 
fix crash when loading game in battle
This commit is contained in:
Ivan Savenko
2025-05-08 15:44:06 +03:00
committed by GitHub
parent e6c75dd66d 7bb7d07230
commit de134326e0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/Client.cpp
View File

@@ -191,7 +191,6 @@ void CClient::endGame()
removeGUI(); removeGUI();
GAME->setMapInstance(nullptr); GAME->setMapInstance(nullptr);
gamestate.reset();
logNetwork->info("Deleted mapHandler and gameState."); logNetwork->info("Deleted mapHandler and gameState.");
@@ -200,6 +199,11 @@ void CClient::endGame()
battleints.clear(); battleints.clear();
battleCallbacks.clear(); battleCallbacks.clear();
playerEnvironments.clear(); playerEnvironments.clear();
//FIXME: gamestate->currentBattles.clear() will use gamestate. So it shoule be callded before gamestate.reset()
gamestate->currentBattles.clear();
gamestate.reset();
logNetwork->info("Deleted playerInts."); logNetwork->info("Deleted playerInts.");
logNetwork->info("Client stopped."); logNetwork->info("Client stopped.");
} }