rpms/kdebase-workspace/devel kdebase-workspace-4.1.2-klipper-crash.patch, NONE, 1.1

Kevin Kofler kkofler at fedoraproject.org
Thu Oct 9 04:26:04 UTC 2008


Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20587/devel

Added Files:
	kdebase-workspace-4.1.2-klipper-crash.patch 
Log Message:
Sync from F9:

* Wed Oct  8 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.2-3
- fix crash when invoking a klipper command for a second time

kdebase-workspace-4.1.2-klipper-crash.patch:

--- NEW FILE kdebase-workspace-4.1.2-klipper-crash.patch ---
Index: klipper/urlgrabber.cpp
===================================================================
--- klipper/urlgrabber.cpp	(revision 868725)
+++ klipper/urlgrabber.cpp	(revision 868726)
@@ -226,7 +226,8 @@
 
 void URLGrabber::slotItemSelected(QAction *action)
 {
-    myMenu->hide(); // deleted by the timer or the next action
+    if (myMenu)
+        myMenu->hide(); // deleted by the timer or the next action
 
     QString id = action->data().toString();
 
@@ -402,8 +403,10 @@
         }
     }
 
-    myMenu->deleteLater();
-    myMenu = 0;
+    if ( myMenu ) {
+        myMenu->deleteLater();
+        myMenu = 0;
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////




More information about the scm-commits mailing list