X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FScreen.cc;h=46b15b2238800c6bb007e42c6f824666eab61552;hb=47585423c6494391db0425f2237890e82f1b031a;hp=92dd4a7074f89b7d12386f8c5328460e6d0ce12f;hpb=bcb14a3ce94ee4b4cba07de7a297470719390331;p=chaz%2Fopenbox

diff --git a/src/Screen.cc b/src/Screen.cc
index 92dd4a70..46b15b22 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -2074,16 +2074,13 @@ const Rect& BScreen::availableArea(void) const {
 }
 
 
-RectList BScreen::allAvailableAreas(void) const {
 #ifdef    XINERAMA
-  if (isXineramaActive())
-    return xineramaUsableArea;
-#endif // XINERAMA
-
-  RectList list;
-  list.push_back(availableArea());
-  return list;
+RectList BScreen::allAvailableAreas(void) const {
+  assert(isXineramaActive());
+  assert(xineramaUsableArea.size() > 0);
+  return xineramaUsableArea;
 }
+#endif // XINERAMA
 
 
 void BScreen::updateAvailableArea(void) {
@@ -2093,7 +2090,7 @@ void BScreen::updateAvailableArea(void) {
 #ifdef    XINERAMA
   // reset to the full areas
   if (isXineramaActive())
-    xineramaUsableArea = allAvailableAreas();
+    xineramaUsableArea = getXineramaAreas();
 #endif // XINERAMA
 
   /* these values represent offsets from the screen edge