From 31c06669611fa3e4c3db51e1c25c99b466e6743f Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Fri, 14 Dec 2012 19:44:16 +0000
Subject: [PATCH] Prevent saves from being loaded twice by the Save browser

---
 src/game/GameController.cpp     | 1 +
 src/search/SearchController.cpp | 5 +++++
 src/search/SearchController.h   | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 188a233b5..efaf1125c 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -40,6 +40,7 @@ public:
 			try
 			{
 				cc->gameModel->SetSave(cc->search->GetLoadedSave());
+				cc->search->ReleaseLoadedSave();
 			}
 			catch(GameModelException & ex)
 			{
diff --git a/src/search/SearchController.cpp b/src/search/SearchController.cpp
index 7930b6545..44ff68148 100644
--- a/src/search/SearchController.cpp
+++ b/src/search/SearchController.cpp
@@ -55,6 +55,11 @@ SaveInfo * SearchController::GetLoadedSave()
 	return searchModel->GetLoadedSave();
 }
 
+void SearchController::ReleaseLoadedSave()
+{
+	searchModel->SetLoadedSave(NULL);
+}
+
 void SearchController::Update()
 {
 	if(!nextQueryDone && nextQueryTime < clock())
diff --git a/src/search/SearchController.h b/src/search/SearchController.h
index 66d464a3c..03967b411 100644
--- a/src/search/SearchController.h
+++ b/src/search/SearchController.h
@@ -44,6 +44,7 @@ public:
 	void RemoveSelected();
 	void UnpublishSelected();
 	void FavouriteSelected();
+	void ReleaseLoadedSave();
 	SaveInfo * GetLoadedSave();
 };