diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-23 11:48:08 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-23 11:48:08 (GMT) |
| commit | 2bd571e1598e6baffc717bcb086d89d01929604b (patch) | |
| tree | b75ac8728d82a76d81586e9a65bbd8098f6d46b1 /src/game/GameController.cpp | |
| parent | 27755b2f277f14a5428219fe2b7eceddcdfc17fe (diff) | |
| download | powder-2bd571e1598e6baffc717bcb086d89d01929604b.zip powder-2bd571e1598e6baffc717bcb086d89d01929604b.tar.gz | |
GameController shut down any render options open
Diffstat (limited to 'src/game/GameController.cpp')
| -rw-r--r-- | src/game/GameController.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp index 09f8f6c..b79da06 100644 --- a/src/game/GameController.cpp +++ b/src/game/GameController.cpp @@ -11,7 +11,8 @@ using namespace std; GameController::GameController(): - search(NULL) + search(NULL), + renderOptions(NULL) { gameView = new GameView(); gameModel = new GameModel(); @@ -29,6 +30,11 @@ GameController::~GameController() ui::Engine::Ref().CloseWindow(); delete search; } + if(renderOptions) + { + ui::Engine::Ref().CloseWindow(); + delete renderOptions; + } delete gameView; delete gameModel; } @@ -135,8 +141,8 @@ void GameController::OpenDisplayOptions() void GameController::OpenRenderOptions() { - RenderController * renderController = new RenderController(gameModel->GetRenderer()); - ui::Engine::Ref().ShowWindow(renderController->GetView()); + renderOptions = new RenderController(gameModel->GetRenderer()); + ui::Engine::Ref().ShowWindow(renderOptions->GetView()); } void GameController::OpenSaveWindow() |