From ecddfcbc0d9431526ef42ba3ba41e22589fc039b Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Thu, 30 Jun 2016 08:16:53 -0400
Subject: [PATCH] don't reset edge mode when saving local saves

---
 src/gui/game/GameController.cpp | 2 +-
 src/gui/game/GameModel.cpp      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp
index cd17c00cd0..128a0d4d85 100644
--- a/src/gui/game/GameController.cpp
+++ b/src/gui/game/GameController.cpp
@@ -1351,7 +1351,7 @@ void GameController::SaveAsCurrent()
 		GameController * c;
 	public:
 		SaveUploadedCallback(GameController * _c): c(_c) {}
-		virtual  ~SaveUploadedCallback() {};
+		virtual  ~SaveUploadedCallback() {}
 		virtual void SaveUploaded(SaveInfo save)
 		{
 			c->LoadSave(&save);
diff --git a/src/gui/game/GameModel.cpp b/src/gui/game/GameModel.cpp
index e1045185a5..f02e5795b7 100644
--- a/src/gui/game/GameModel.cpp
+++ b/src/gui/game/GameModel.cpp
@@ -654,7 +654,6 @@ void GameModel::SetSaveFile(SaveFile * newSave)
 		{
 			sim->grav->stop_grav_async();
 		}
-		sim->SetEdgeMode(0);
 		sim->clear_sim();
 		ren->ClearAccumulation();
 		sim->Load(saveData);