From b926c2f8d6bd8d01f541b24c752db3b39cb18b35 Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Mon, 21 Dec 2009 23:30:21 +0000
Subject: [PATCH] Fix 'LOADING...' message broken by a previous cleanup

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3462 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/uqm/gameopt.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/sc2/src/uqm/gameopt.c b/sc2/src/uqm/gameopt.c
index 58f7e9561..096c7f87d 100644
--- a/sc2/src/uqm/gameopt.c
+++ b/sc2/src/uqm/gameopt.c
@@ -943,8 +943,12 @@ SaveLoadGame (PICK_GAME_STATE *pickState, COUNT gameIndex)
 	STAMP saveStamp;
 	BOOLEAN success;
 
+	saveStamp.frame = NULL;
+
+	// TODO: fix ConfirmSaveLoad() interface so it does not rely on
+	//   MsgStamp != NULL parameter.
 	LockMutex (GraphicsLock);
-	ConfirmSaveLoad (&saveStamp);
+	ConfirmSaveLoad (pickState->saving ? &saveStamp : NULL);
 	UnlockMutex (GraphicsLock);
 
 	if (pickState->saving)
@@ -952,10 +956,14 @@ SaveLoadGame (PICK_GAME_STATE *pickState, COUNT gameIndex)
 	else
 		success = LoadGame (gameIndex, NULL);
 
-	// restore the screen under "Saving..." message
-	LockMutex (GraphicsLock);
-	DrawStamp (&saveStamp);
-	UnlockMutex (GraphicsLock);
+	// TODO: the same should be done for both save and load if we also
+	//   display a load problem message
+	if (pickState->saving)
+	{	// restore the screen under "SAVING..." message
+		LockMutex (GraphicsLock);
+		DrawStamp (&saveStamp);
+		UnlockMutex (GraphicsLock);
+	}
 
 	DestroyDrawable (ReleaseDrawable (saveStamp.frame));