소스 검색

fix crash when loading game in battle

kdmcser 5 달 전
부모
커밋
7bb7d07230
1개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      client/Client.cpp

+ 5 - 1
client/Client.cpp

@@ -191,7 +191,6 @@ void CClient::endGame()
 	removeGUI();
 
 	GAME->setMapInstance(nullptr);
-	gamestate.reset();
 
 	logNetwork->info("Deleted mapHandler and gameState.");
 
@@ -200,6 +199,11 @@ void CClient::endGame()
 	battleints.clear();
 	battleCallbacks.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("Client stopped.");
 }