diff options
| author | Timothy Pearson <[email protected]> | 2013-04-05 01:48:22 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-04-05 01:48:22 -0500 |
| commit | 6a7a4e6901300922f72e71782811973f46861e7b (patch) | |
| tree | 1ee590845b7cdace7671fa6bbb9435513b6dc2cd | |
| parent | 4ee736a26459318950f8b68158011b78227a20bd (diff) | |
| download | tdelibs-6a7a4e6901300922f72e71782811973f46861e7b.tar.gz tdelibs-6a7a4e6901300922f72e71782811973f46861e7b.zip | |
Properly repair kicker crahs on start
This resolves Bug 1161
Thanks to Fat-Zer for the patch!
| -rw-r--r-- | tdeui/ksharedpixmap.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp index 33eca17e4..d9b6a6954 100644 --- a/tdeui/ksharedpixmap.cpp +++ b/tdeui/ksharedpixmap.cpp @@ -160,17 +160,9 @@ bool TDESharedPixmap::x11Event(XEvent *event) void *drawable_id = (void *) pixmap_id; Drawable pixmap = *(Drawable*) drawable_id; - Status status = XGetGeometry(tqt_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(tqt_xdisplay(), pixmap, &root, &dummy, &dummy, &width, &height, &udummy, &udummy)) { return false; + } if (d->rect.isEmpty()) { |