rpms/kdebase-runtime/F-8 kdebase-runtime-4.1.2-kioexec.patch, NONE, 1.1

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13455/F-8

Added Files:
	kdebase-runtime-4.1.2-kioexec.patch 
Log Message:
Sync from devel:

* Tue Oct 14 2008 Than Ngo <than at redhat.com> 4.1.2-5
- apply upstream patch, kioexec processes never terminate

kdebase-runtime-4.1.2-kioexec.patch:

--- NEW FILE kdebase-runtime-4.1.2-kioexec.patch ---
Index: kdebase-runtime/kioexec/main.cpp
===================================================================
--- kdebase-runtime/kioexec/main.cpp	(Revision 870759)
+++ kdebase-runtime/kioexec/main.cpp	(Revision 870760)
@@ -47,6 +47,7 @@
 
 
 KIOExec::KIOExec()
+    : mExited(false)
 {
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
     if (args->count() < 1)
@@ -162,6 +163,7 @@
 {
     if ( fileList.isEmpty() ) {
         kDebug() << "No files downloaded -> exiting";
+        mExited = true;
         QApplication::exit(1);
         return;
     }
@@ -244,6 +246,7 @@
         }
     }
 
+    mExited = true;
     QApplication::exit(0);
 }
 
@@ -271,7 +274,10 @@
 
     KIOExec exec;
 
-    kDebug() << "Constructor returned...";
+    // Don't go into the event loop if we already want to exit (#172197)
+    if (exec.exited())
+        return 0;
+
     return app.exec();
 }
 
Index: kdebase-runtime/kioexec/main.h
===================================================================
--- kdebase-runtime/kioexec/main.h	(Revision 870759)
+++ kdebase-runtime/kioexec/main.h	(Revision 870760)
@@ -36,11 +36,14 @@
 public:
     KIOExec();
 
+    bool exited() const { return mExited; }
+
 public Q_SLOTS:
     void slotResult( KJob * );
     void slotRunApp();
 
 protected:
+    bool mExited;
     bool tempfiles;
     QString suggestedFileName;
     int counter;