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

[Sam Spilsbury]

Fix bug 886978

[Tim Penhey (thumper)]

You are going to need to start thinking how to put this type of code into unit tests.

review: Approve

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-10-26 23:18:47 +0000
+++ src/window.cpp	2011-11-07 02:35:26 +0000
@@ -2026,8 +2026,16 @@
     if (priv->geometry.border () != ce->border_width)
 	valueMask |= CWBorderWidth;
 
-    if (ROOTPARENT (window->prev) != ce->above)
-	valueMask |= CWSibling | CWStackMode;
+    if (window->prev)
+    {
+	if (ROOTPARENT (window->prev) != ce->above)
+	    valueMask |= CWSibling | CWStackMode;
+    }
+    else
+    {
+	if (ce->above != 0)
+	    valueMask |= CWSibling | CWStackMode;
+    }
 
     priv->attrib.override_redirect = ce->override_redirect;