diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-19 20:31:24 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-19 20:31:24 (GMT) |
| commit | 43ed72b4c5c803eaac0af7589f25a9f74e1df33b (patch) | |
| tree | 3a82a99df0fc5aae157b5a0db37b7f6bec24642d /src/game | |
| parent | 9dd9d525648fa941419e13bedd498d634b0b136b (diff) | |
| download | powder-43ed72b4c5c803eaac0af7589f25a9f74e1df33b.zip powder-43ed72b4c5c803eaac0af7589f25a9f74e1df33b.tar.gz | |
Fix a few small (a lot of big) memory leaks associated with the stamps browser
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/GameController.cpp | 10 | ||||
| -rw-r--r-- | src/game/GameModel.cpp | 2 | ||||
| -rw-r--r-- | src/game/GameView.cpp | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp index 91c64c0..f1371a5 100644 --- a/src/game/GameController.cpp +++ b/src/game/GameController.cpp @@ -180,6 +180,10 @@ GameController::~GameController() { delete activePreview; } + if(localBrowser) + { + delete localBrowser; + } if(ui::Engine::Ref().GetWindow() == gameView) { ui::Engine::Ref().CloseWindow(); @@ -751,6 +755,12 @@ void GameController::Update() delete loginWindow; loginWindow = NULL; } + + if(localBrowser && localBrowser->HasDone) + { + delete localBrowser; + localBrowser = NULL; + } } void GameController::SetZoomEnabled(bool zoomEnabled) diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index f27ebfa..23f3404 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -119,6 +119,8 @@ GameModel::~GameModel() } delete sim; delete ren; + if(placeSave) + delete placeSave; if(clipboard) delete clipboard; if(stamp) diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index f812358..f354df0 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -527,6 +527,9 @@ GameView::~GameView() if(!colourAValue->GetParentWindow()) delete colourAValue; + + if(placeSaveThumb) + delete placeSaveThumb; } class GameView::MenuAction: public ui::ButtonAction |