Merge lp:~compiz-team/compiz-core/compiz-core.fix_861793 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Fix LP 861793

[Jason Smith (jassmith)]

review: Approve

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-09-27 15:45:28 +0000
+++ src/window.cpp	2011-09-29 03:00:23 +0000
@@ -3983,42 +3983,44 @@
 	 * if serverPrev was recently restacked */
 	if (window->serverPrev)
 	{
-	    bool pendingRestacks = false;
-
-	    foreach (XWCValueMask &xwcvm, sibling->priv->pendingConfigures)
-	    {
-		if (xwcvm.second & (CWSibling | CWStackMode))
-		{
-		    pendingRestacks = true;
-		    break;
-		}
-	    }
-
-	    if (!sibling && window->serverPrev)
-	    {
-		XWindowChanges xwc;
+	    if (!sibling)
+	    {
+		XWindowChanges lxwc;
 		unsigned int   valueMask = CWStackMode;
 
-		xwc.stack_mode = Below;
+		lxwc.stack_mode = Below;
 
 		/* Below with no sibling puts the window at the bottom
 		 * of the stack */
-		XConfigureWindow (screen->dpy (), ROOTPARENT (window), valueMask, &xwc);
+		XConfigureWindow (screen->dpy (), ROOTPARENT (window), valueMask, &lxwc);
 
 		if (serverFrame)
-		    priv->addPendingConfigure (xwc, CWStackMode);
+		    priv->addPendingConfigure (lxwc, CWStackMode);
 
 		/* Update the list of windows last sent to the server */
 		screen->unhookServerWindow (window);
 		screen->insertServerWindow (window, 0);
 	    }
-	    else if (sibling->priv->id != window->serverPrev->priv->id ||
-		     pendingRestacks)
+	    else if (sibling)
 	    {
-		mask |= CWSibling | CWStackMode;
-
-		xwc->stack_mode = Above;
-		xwc->sibling    = ROOTPARENT (sibling);
+		bool pendingRestacks = false;
+
+		foreach (XWCValueMask &xwcvm, sibling->priv->pendingConfigures)
+		{
+		    if (xwcvm.second & (CWSibling | CWStackMode))
+		    {
+			pendingRestacks = true;
+			break;
+		    }
+		}
+
+		if (sibling->priv->id != window->serverPrev->priv->id || pendingRestacks)
+		{
+		    mask |= CWSibling | CWStackMode;
+
+		    xwc->stack_mode = Above;
+		    xwc->sibling    = ROOTPARENT (sibling);
+		}
 	    }
 	}
 	else if (sibling)