From 08b17f49e81565a877a5ab78a4d258bce2fe45c1 Mon Sep 17 00:00:00 2001
From: mcmartin <mcmartin@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Wed, 19 Apr 2006 03:50:07 +0000
Subject: [PATCH] Fix a spinlock in the final Melee score screen (Bug 879)

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2312 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog              | 1 +
 sc2/src/sc2code/pickmele.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 9233c5208..e8cf2c67c 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.6:
+- Fixed a spinlock in Melee's final score screen (Bug 879) - Michael
 - Phase 2 of online keyconfig - Setup Menu can configure assignment of 
   templates to players - Michael
 - Control scheme shifted to Menus + Control Templates in preparation for 
diff --git a/sc2/src/sc2code/pickmele.c b/sc2/src/sc2code/pickmele.c
index 9e2fffc95..e62258f6c 100644
--- a/sc2/src/sc2code/pickmele.c
+++ b/sc2/src/sc2code/pickmele.c
@@ -315,9 +315,11 @@ GetMeleeStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player)
 				PressState = ButtonState;
 				ButtonState = FALSE;
 			}
+
+			TaskSwitch ();
 		} while (!(GLOBAL (CurrentActivity) & CHECK_ABORT) && (!ButtonState
 				&& (!(PlayerControl[0] & PlayerControl[1] & PSYTRON_CONTROL)
-				|| (TaskSwitch (), GetTimeCounter ()) < TimeOut)));
+				|| GetTimeCounter () < TimeOut)));
 
 		LockMutex (GraphicsLock);