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);