summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-08 19:21:59 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-08 19:21:59 (GMT)
commitbd296673558fe75fee039bd27b0a71960dc426bc (patch)
tree637c48f0aadb0721a5f4d9be077c3c40544abfcd /src
parent9f1301df5a5d00c13a53912e09df3e316f74f76c (diff)
downloadpowder-bd296673558fe75fee039bd27b0a71960dc426bc.zip
powder-bd296673558fe75fee039bd27b0a71960dc426bc.tar.gz
Do not delete given savefile in GameModel::SetSaveFile, behaviour should be similar to GameModel::SetSave in terms of managing memory in given pointer
Diffstat (limited to 'src')
-rw-r--r--src/game/GameController.cpp1
-rw-r--r--src/game/GameModel.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index cea50cb..06ba1d4 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -717,6 +717,7 @@ void GameController::OpenLocalBrowse()
virtual void FileSelected(SaveFile* file)
{
c->LoadSaveFile(file);
+ delete file;
}
};
new FileBrowserActivity(LOCAL_SAVE_DIR PATH_SEP, new LocalSaveOpenCallback(this));
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index a53bba2..91ddd53 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -398,7 +398,6 @@ void GameModel::SetSaveFile(SaveFile * newSave)
sim->clear_sim();
sim->Load(saveData);
}
- delete newSave;
notifySaveChanged();
UpdateQuickOptions();