From 32c7208a1897a272bbf6a4b7f655440183710766 Mon Sep 17 00:00:00 2001 From: titiger Date: Wed, 23 Nov 2016 00:31:54 +0100 Subject: [PATCH] No more game crashing for xml errors --- source/glest_game/game/game.h | 1 + source/glest_game/main/program.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/source/glest_game/game/game.h b/source/glest_game/game/game.h index 84a094ca..f17756f9 100644 --- a/source/glest_game/game/game.h +++ b/source/glest_game/game/game.h @@ -243,6 +243,7 @@ public: GameSettings *getGameSettings() {return &gameSettings;} void setGameSettings(GameSettings *settings) { gameSettings = *settings;} const GameSettings *getReadOnlyGameSettings() const {return &gameSettings;} + void setQuitPendingIndicator() { quitPendingIndicator = true;} const GameCamera *getGameCamera() const {return &gameCamera;} GameCamera *getGameCameraPtr() {return &gameCamera;} diff --git a/source/glest_game/main/program.cpp b/source/glest_game/main/program.cpp index 95b47f85..c8d4a695 100644 --- a/source/glest_game/main/program.cpp +++ b/source/glest_game/main/program.cpp @@ -706,6 +706,7 @@ void Program::setState(ProgramState *programStateNew, bool cleanupOldState) { try { Game *game = dynamic_cast(programStateNew); Renderer &renderer= Renderer::getInstance(); + game->setQuitPendingIndicator();// by this the world is no more updated renderer.initGame(game,game->getGameCameraPtr()); } catch(megaglest_runtime_error& ex2) {