From f435cf38817d9761360b818ee623810134f17e6e Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Sat, 10 Oct 2015 18:10:17 -0400
Subject: [PATCH] fix edge mode not loading properly in saves, options menu
 uses edge mode from Simulation and not GameModel

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

diff --git a/src/gui/game/GameModel.cpp b/src/gui/game/GameModel.cpp
index ab9fadd916..4e1e03b58b 100644
--- a/src/gui/game/GameModel.cpp
+++ b/src/gui/game/GameModel.cpp
@@ -575,7 +575,6 @@ void GameModel::SetSave(SaveInfo * newSave)
 			sim->grav->start_grav_async();
 		else
 			sim->grav->stop_grav_async();
-		sim->SetEdgeMode(0);
 		sim->clear_sim();
 		ren->ClearAccumulation();
 		sim->Load(saveData);
diff --git a/src/gui/options/OptionsModel.cpp b/src/gui/options/OptionsModel.cpp
index 5e2218e4e7..a687a76394 100644
--- a/src/gui/options/OptionsModel.cpp
+++ b/src/gui/options/OptionsModel.cpp
@@ -72,7 +72,7 @@ void OptionsModel::SetAirMode(int airMode)
 
 int OptionsModel::GetEdgeMode()
 {
-	return gModel->GetEdgeMode();
+	return gModel->GetSimulation()->edgeMode;
 }
 void OptionsModel::SetEdgeMode(int edgeMode)
 {