summaryrefslogtreecommitdiff
path: root/src/game/GameModel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/GameModel.cpp')
-rw-r--r--src/game/GameModel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index 2ae0713..5c9344d 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -281,13 +281,13 @@ SaveInfo * GameModel::GetSave()
void GameModel::SetSave(SaveInfo * newSave)
{
- if(currentSave)
+ if(currentSave != newSave)
delete currentSave;
currentSave = newSave;
if(currentSave && currentSave->GetGameSave())
{
GameSave * saveData = currentSave->GetGameSave();
- SetPaused(saveData->paused);
+ SetPaused(saveData->paused & GetPaused());
sim->gravityMode = saveData->gravityMode;
sim->air->airMode = saveData->airMode;
sim->legacy_enable = saveData->legacyEnable;