From 2dad7fde32e8ea6ccc660f350182587e7e6b08e1 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 29 Apr 2010 03:39:54 +0000
Subject: [PATCH] More display switching repairs

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1120415 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdeui/kmenubar.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kdeui/kmenubar.cpp b/kdeui/kmenubar.cpp
index fcadd8648..3de441a17 100644
--- a/kdeui/kmenubar.cpp
+++ b/kdeui/kmenubar.cpp
@@ -328,7 +328,11 @@ void KMenuBar::selectionTimeout()
         KConfigGroup xineramaConfig(KGlobal::config(),"Xinerama");
         int screen = xineramaConfig.readNumEntry("MenubarScreen",
             QApplication::desktop()->screenNumber(QPoint(0,0)) );
-        QRect area = QApplication::desktop()->screenGeometry(screen);
+        QRect area;
+        if (kapp->desktop()->numScreens() < 2)
+            area = kapp->desktop()->geometry();
+        else
+            area = kapp->desktop()->screenGeometry(screen);
         int margin = 0;
 	move(area.left() - margin, area.top() - margin); 
         setFixedSize(area.width() + 2* margin , heightForWidth( area.width() + 2 * margin ) );