diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-05-05 23:24:53 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-05-05 23:24:53 (GMT) |
| commit | b8b5f91e203c4ce2bd411f56694767546d503edd (patch) | |
| tree | ff3c10e3d69f4f6288972b5d33d91e55570d7168 /src/gui/game/GameController.cpp | |
| parent | fea71ec69b48e6756a6b5fde58ae98ee4348b61f (diff) | |
| download | powder-b8b5f91e203c4ce2bd411f56694767546d503edd.zip powder-b8b5f91e203c4ce2bd411f56694767546d503edd.tar.gz | |
Only free GameView if it can be closed
Diffstat (limited to 'src/gui/game/GameController.cpp')
| -rw-r--r-- | src/gui/game/GameController.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index 55ca029..ed1a866 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<Snapshot*> history = gameModel->GetHistory(); for(std::deque<Snapshot*>::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() |