summaryrefslogtreecommitdiff
path: root/src/game/GameModel.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-09-29 21:53:32 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-09-29 21:53:32 (GMT)
commit2e99638d7616af49be52cd43b0022cace2a52b41 (patch)
tree87290facce2ef0b708ff3819566fe6a52d88166d /src/game/GameModel.cpp
parentef24a1ad44b13d696ad8aaf07663bfca8cc992e0 (diff)
downloadpowder-2e99638d7616af49be52cd43b0022cace2a52b41.zip
powder-2e99638d7616af49be52cd43b0022cace2a52b41.tar.gz
Fix crash loading null stamp after pasting (http://powdertoy.co.uk/Discussions/Thread/View.html?Thread=15107)
Diffstat (limited to 'src/game/GameModel.cpp')
-rw-r--r--src/game/GameModel.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index b601403..7c64367 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -752,11 +752,14 @@ void GameModel::SetStamp(GameSave * save)
void GameModel::SetPlaceSave(GameSave * save)
{
if(save != placeSave)
- delete placeSave;
- if(save != placeSave)
- placeSave = new GameSave(*save);
- else if(!save)
- placeSave = NULL;
+ {
+ if(placeSave)
+ delete placeSave;
+ if(save)
+ placeSave = new GameSave(*save);
+ else
+ placeSave = NULL;
+ }
notifyPlaceSaveChanged();
}