Fixed concurrent fades regression; bug #1079

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3499 8092fc87-c524-0410-9efc-e669fe64eaf9
2010-01-16 21:56:46 +00:00
parent 630748761f
commit a5e0b24a06
2 changed files with 11 additions and 2 deletions
@@ -347,14 +347,20 @@ GetFadeAmount (void)
 }

 static void
-FlushFadeXForms (void)
+finishPendingFade (void)
 {
-	LockMutex (XFormControl.Lock);
 	if (fadeInterval)
 	{	// end the fade immediately
 		fadeAmount += fadeDelta;
 		fadeInterval = 0;
 	}
+}
+
+static void
+FlushFadeXForms (void)
+{
+	LockMutex (XFormControl.Lock);
+	finishPendingFade ();
 	UnlockMutex (XFormControl.Lock);
 }

@@ -388,6 +394,8 @@ FadeScreen (ScreenFadeType fadeType, SIZE TimeInterval)

 	LockMutex (XFormControl.Lock);

+	finishPendingFade ();
+
 	if (TimeInterval <= 0)
 	{	// end the fade immediately
 		fadeAmount = FadeEnd;