From 7c0ba094b87a43ebaf819b8f38894163a9df8ae6 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Fri, 5 Oct 2012 16:30:32 +0100
Subject: [PATCH] Ensure save is stored in memory for reload when using Save as
 current name, correct ServerSaveActivity to call SaveUploaded when doing an
 instant upload

---
 src/game/GameController.cpp     |  3 +--
 src/save/ServerSaveActivity.cpp | 11 +++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index a1c4965da..8ba215e90 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -1101,8 +1101,7 @@ void GameController::SaveAsCurrent()
 		virtual  ~SaveUploadedCallback() {};
 		virtual void SaveUploaded(SaveInfo save)
 		{
-			//Don't do anything
-			//c->LoadSave(&save);
+			c->LoadSave(&save);
 		}
 	};
 
diff --git a/src/save/ServerSaveActivity.cpp b/src/save/ServerSaveActivity.cpp
index f5caf779e..d336ea17d 100644
--- a/src/save/ServerSaveActivity.cpp
+++ b/src/save/ServerSaveActivity.cpp
@@ -33,7 +33,6 @@ public:
 	}
 };
 
-//Currently, reading is done on another thread, we can't render outside the main thread due to some bullshit with OpenGL 
 class SaveUploadTask: public Task
 {
 	SaveInfo save;
@@ -151,11 +150,19 @@ ServerSaveActivity::ServerSaveActivity(SaveInfo save, bool saveNow, ServerSaveAc
 
 void ServerSaveActivity::NotifyDone(Task * task)
 {
-	Exit();
 	if(!task->GetSuccess())
 	{
+		Exit();
 		new ErrorMessage("Error", Client::Ref().GetLastError());
 	}
+	else
+	{
+		if(callback)
+		{
+			callback->SaveUploaded(save);
+		}
+		Exit();
+	}
 }
 
 void ServerSaveActivity::Save()