summaryrefslogtreecommitdiff
path: root/src/game/GameController.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-06-20 12:40:34 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-06-20 12:40:34 (GMT)
commite81e18238df47212d84fa00422a64983857e1ea1 (patch)
tree67c973f1f3666f9f4b230524575cda5dd6cc4cd6 /src/game/GameController.cpp
parent2be9c925088c16beb144dd9932202416d00ff581 (diff)
parentf6403958de1f67d3bce47f56b40de254c30f5ba4 (diff)
downloadpowder-e81e18238df47212d84fa00422a64983857e1ea1.zip
powder-e81e18238df47212d84fa00422a64983857e1ea1.tar.gz
Merge branch 'master' of github.com:FacialTurd/PowderToypp
Diffstat (limited to 'src/game/GameController.cpp')
-rw-r--r--src/game/GameController.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index dfbd935..6ed6e0f 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -39,7 +39,7 @@ public:
{
try
{
- cc->gameModel->SetSave(new SaveInfo(*(cc->search->GetLoadedSave())));
+ cc->gameModel->SetSave(cc->search->GetLoadedSave());
}
catch(GameModelException & ex)
{
@@ -163,6 +163,7 @@ GameController::~GameController()
ui::Engine::Ref().CloseWindow();
}
delete gameModel;
+ delete gameView;
}
GameView * GameController::GetView()