summaryrefslogtreecommitdiffstats
path: root/kcontrol/randr
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-04-21 19:01:33 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-04-21 19:01:33 +0000
commit0a9caa3b3716846c944b76795b182caa4050e63a (patch)
tree93edad259cad5c669297858f198ae2bc88b5be28 /kcontrol/randr
parent9885131c3e220b351fa05ff9fdee265b7f83549e (diff)
downloadtdebase-0a9caa3b3716846c944b76795b182caa4050e63a.tar.gz
tdebase-0a9caa3b3716846c944b76795b182caa4050e63a.zip
Backport of SVN r1097263 to fix Solaris compilation with [CVE-2010-0436]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1117290 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/randr')
-rw-r--r--kcontrol/randr/krandrtray.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index 3c1317e92..508c4a6ae 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -74,8 +74,10 @@ KRandRSystemTray::KRandRSystemTray(QWidget* parent, const char *name)
randr_display = XOpenDisplay(NULL);
- last_known_x = currentScreen()->currentPixelWidth();
- last_known_y = currentScreen()->currentPixelHeight();
+ if (isValid() == true) {
+ last_known_x = currentScreen()->currentPixelWidth();
+ last_known_y = currentScreen()->currentPixelHeight();
+ }
}
void KRandRSystemTray::mousePressEvent(QMouseEvent* e)