matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only free GameView if it can be closed

Browse Source
This commit is contained in:
Simon Robertshaw 2013-05-06 00:24:53 +01:00
parent fea71ec69b
commit b8b5f91e20
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/game/GameController.cpp
View File

@ -193,10 +193,6 @@ GameController::~GameController()
{ {
delete options; 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 //deleted here because it refuses to be deleted when deleted from gameModel even with the same code
std::deque<Snapshot*> history = gameModel->GetHistory(); std::deque<Snapshot*> history = gameModel->GetHistory();
for(std::deque<Snapshot*>::iterator iter = history.begin(), end = history.end(); iter != end; ++iter) for(std::deque<Snapshot*>::iterator iter = history.begin(), end = history.end(); iter != end; ++iter)
@ -214,7 +210,11 @@ GameController::~GameController()
delete *iter; delete *iter;
} }
delete gameModel; delete gameModel;
delete gameView; if(ui::Engine::Ref().GetWindow() == gameView)
{
ui::Engine::Ref().CloseWindow();
delete gameView;
}
} }
void GameController::HistoryRestore() void GameController::HistoryRestore()