From 589a8fa7ca9aa7fbc2ed921dfb3019648f58459e Mon Sep 17 00:00:00 2001
From: mcmartin <mcmartin@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Wed, 7 Apr 2004 03:14:09 +0000
Subject: [PATCH] F10-Quit from roster works now (Bug #591) - Michael

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1350 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog                    | 1 +
 sc2/src/sc2code/planets/roster.c | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 6396aad46..14c37b289 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.4:
+- Fixed Roster-F10-Quit bug (#591), - Michael
 - Restructuring of the unix build scripts.
   Also, interrupted dependency builds are now detected. - SvdB
 - Unix build: Make it possible to use another directory than the current
diff --git a/sc2/src/sc2code/planets/roster.c b/sc2/src/sc2code/planets/roster.c
index e0b826836..777ffb984 100644
--- a/sc2/src/sc2code/planets/roster.c
+++ b/sc2/src/sc2code/planets/roster.c
@@ -169,7 +169,9 @@ RosterCleanup (PMENU_STATE pMS)
 {
 	if (pMS->flash_task)
 	{
-		Task_SetState (pMS->flash_task, TASK_EXIT);
+		UnlockMutex (GraphicsLock);
+		ConcludeTask (pMS->flash_task);
+		LockMutex (GraphicsLock);
 		pMS->flash_task = 0;
 	}
 
@@ -211,10 +213,10 @@ DoModifyRoster (PMENU_STATE pMS)
 
 	if (GLOBAL (CurrentActivity) & CHECK_ABORT)
 	{
-		pMS->CurFrame = 0;
 		LockMutex (GraphicsLock);
 		RosterCleanup (pMS);
 		UnlockMutex (GraphicsLock);
+		pMS->CurFrame = 0;
 
 		return (FALSE);
 	}