From b8b5f91e203c4ce2bd411f56694767546d503edd Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Mon, 6 May 2013 00:24:53 +0100
Subject: [PATCH] Only free GameView if it can be closed

---
 src/gui/game/GameController.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp
index 55ca02927..ed1a866bd 100644
--- a/src/gui/game/GameController.cpp
+++ b/src/gui/game/GameController.cpp
@@ -193,10 +193,6 @@ GameController::~GameController()
 	{
 		delete options;
 	}
-	if(ui::Engine::Ref().GetWindow() == gameView)
-	{
-		ui::Engine::Ref().CloseWindow();
-	}
 	//deleted here because it refuses to be deleted when deleted from gameModel even with the same code
 	std::deque<Snapshot*> history = gameModel->GetHistory();
 	for(std::deque<Snapshot*>::iterator iter = history.begin(), end = history.end(); iter != end; ++iter)
@@ -214,7 +210,11 @@ GameController::~GameController()
 		delete *iter;
 	}
 	delete gameModel;
-	delete gameView;
+	if(ui::Engine::Ref().GetWindow() == gameView)
+	{
+		ui::Engine::Ref().CloseWindow();
+		delete gameView;
+	}
 }
 
 void GameController::HistoryRestore()