[fusion-commits] Animation plugin: Changes to 'master' (416bf8709687c77e98426f98dec83c1e7ec13470)

[cornelius at server.beryl-project.org]

New commits:
commit 416bf8709687c77e98426f98dec83c1e7ec13470
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Sun Jul 8 19:45:27 2007 -0400

    Fix focusfade hang: focus win A, B, then A, before 1st anim is done.
    (where A is not focused initially and A & B are overlapping).


 animation.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


Modified: fusion/plugins/animation/animation.c
===================================================================
--- fusion/plugins/animation/animation.c
+++ fusion/plugins/animation/animation.c
@@ -1269,11 +1269,6 @@ initiateFocusAnimation(CompWindow *w)
 	as->scaleActive || as->switcherActive || 
 	as->groupTabChangeActive || as->fadeDesktopActive)
     {
-	if (aw->restackInfo)
-	{
-	    free(aw->restackInfo);
-	    aw->restackInfo = NULL;
-	}
 	return;
     }
 
@@ -1558,6 +1553,12 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
 		ANIM_WINDOW(w);
 		if (aw->restackInfo)
 		{
+		    if (aw->curWindowEvent != WindowEventNone ||
+			as->scaleActive || as->switcherActive || 
+			as->groupTabChangeActive || as->fadeDesktopActive)
+		    {
+			continue;
+		    }
 		    // Check if above window is focus-fading
 		    // (like a dialog of an app. window)
 		    // if so, focus-fade this together with the one above