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

[Sam Spilsbury]

Fix bug 861341

[Jason Smith (jassmith)]

review: Approve

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2011-09-27 14:20:10 +0000
+++ src/screen.cpp	2011-09-28 12:38:13 +0000
@@ -3250,6 +3250,7 @@
 CompScreen::updateWorkarea ()
 {
     CompRect workArea;
+    CompRegion allWorkArea = CompRegion ();
     bool     workAreaChanged = false;
 
     for (unsigned int i = 0; i < priv->outputDevs.size (); i++)
@@ -3263,11 +3264,11 @@
 	    workAreaChanged = true;
 	    priv->outputDevs[i].setWorkArea (workArea);
 	}
+
+	allWorkArea += workArea;
     }
 
-    workArea = priv->computeWorkareaForBox (CompRect (0, 0,
-						      screen->width (),
-						      screen->height ()));
+    workArea = allWorkArea.boundingRect ();
 
     if (priv->workArea != workArea)
     {