diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-05 01:48:22 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-04-05 15:05:14 +0200 |
| commit | 14d9fc726e4df9c26e7556899682000bf46c384d (patch) | |
| tree | bbccf2df69060a0195328dcd67c743a20794f0af /kdeui | |
| parent | 8cd519691dbe75f3351016f05d84a47df4d05c18 (diff) | |
| download | tdelibs-14d9fc726e4df9c26e7556899682000bf46c384d.tar.gz tdelibs-14d9fc726e4df9c26e7556899682000bf46c384d.zip | |
Properly repair kicker crahs on start
This resolves Bug 1161
Thanks to Fat-Zer for the patch!
(cherry picked from commit 6a7a4e6901300922f72e71782811973f46861e7b)
Diffstat (limited to 'kdeui')
| -rw-r--r-- | kdeui/ksharedpixmap.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/kdeui/ksharedpixmap.cpp b/kdeui/ksharedpixmap.cpp index 9cd98fd8a..62e6e008e 100644 --- a/kdeui/ksharedpixmap.cpp +++ b/kdeui/ksharedpixmap.cpp @@ -160,17 +160,9 @@ bool KSharedPixmap::x11Event(XEvent *event) void *drawable_id = (void *) pixmap_id; Drawable pixmap = *(Drawable*) drawable_id; - Status status = XGetGeometry(qt_xdisplay(), pixmap, &root, &dummy, &dummy, &width, &height, &udummy, &udummy); - - // HACK - // XGetGeometry can return bogus values on some systems, leading to a SIGFPE - // See http://bugs.trinitydesktop.org/show_bug.cgi?id=1161 for details - // Work around that here... - if ((width < 1) || (height < 1)) - return false; - - if (status == BadDrawable) + if (!XGetGeometry(qt_xdisplay(), pixmap, &root, &dummy, &dummy, &width, &height, &udummy, &udummy)) { return false; + } if (d->rect.isEmpty()) { |