diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index 55ca02927..ed1a866bd 100644 --- a/src/gui/game/GameController.cpp +++ b/src/gui/game/GameController.cpp @@ -193,10 +193,6 @@ GameController::~GameController() { delete options; } - if(ui::Engine::Ref().GetWindow() == gameView) - { - ui::Engine::Ref().CloseWindow(); - } //deleted here because it refuses to be deleted when deleted from gameModel even with the same code std::deque history = gameModel->GetHistory(); for(std::deque::iterator iter = history.begin(), end = history.end(); iter != end; ++iter) @@ -214,7 +210,11 @@ GameController::~GameController() delete *iter; } delete gameModel; - delete gameView; + if(ui::Engine::Ref().GetWindow() == gameView) + { + ui::Engine::Ref().CloseWindow(); + delete gameView; + } } void GameController::HistoryRestore()