diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-29 17:12:35 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-29 17:12:35 (GMT) |
| commit | 80aa7219a2d47632efa5d72b79bbb4fc65721631 (patch) | |
| tree | 257086419a3380872195415ffffb47ec52fff972 /src/game/GameController.cpp | |
| parent | 680a36549adaed0c3ce7e8906fadbdf190b0b3b0 (diff) | |
| download | powder-80aa7219a2d47632efa5d72b79bbb4fc65721631.zip powder-80aa7219a2d47632efa5d72b79bbb4fc65721631.tar.gz | |
Vote view in save preview, better handling of controller destruction
Diffstat (limited to 'src/game/GameController.cpp')
| -rw-r--r-- | src/game/GameController.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp index 1e41542..65556db 100644 --- a/src/game/GameController.cpp +++ b/src/game/GameController.cpp @@ -68,23 +68,20 @@ GameController::~GameController() { if(search) { - if(ui::Engine::Ref().GetWindow() == search->GetView()) - ui::Engine::Ref().CloseWindow(); delete search; } if(renderOptions) { - if(ui::Engine::Ref().GetWindow() == renderOptions->GetView()) - ui::Engine::Ref().CloseWindow(); delete renderOptions; } if(loginWindow) { - if(ui::Engine::Ref().GetWindow() == loginWindow->GetView()) - ui::Engine::Ref().CloseWindow(); delete loginWindow; } - delete gameView; + if(ui::Engine::Ref().GetWindow() == gameView) + { + ui::Engine::Ref().CloseWindow(); + } delete gameModel; } |