From 1de6538f734e6e0800bc92ada7a3d8f8afd6268b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 7 Apr 2014 21:29:01 +0000
Subject: Fix Konqueror popup menu hang when tdeioslave localurl job is not
 responding properly

---
 libkonq/konq_popupmenu.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libkonq')

diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index c5042b873..b5e3be44d 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -429,8 +429,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
             connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool)));
             connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed()));
             while (!d->localURLSlotFired) {
-                usleep(100);
-                tqApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
+                kapp->eventLoop()->enterLoop();
             }
             if (d->localURLResultIsLocal) {
                 realURL = d->localURLResultURL;
@@ -1231,6 +1230,7 @@ void KonqPopupMenu::slotLocalURL(TDEIO::LocalURLJob *job, const KURL& url, bool
   d->localURLSlotFired = true;
   d->localURLResultURL = url;
   d->localURLResultIsLocal = isLocal;
+  kapp->eventLoop()->exitLoop();
 }
 
 void KonqPopupMenu::slotLocalURLKIODestroyed()
@@ -1239,6 +1239,7 @@ void KonqPopupMenu::slotLocalURLKIODestroyed()
     d->localURLSlotFired = true;
     d->localURLResultURL = KURL();
     d->localURLResultIsLocal = false;
+    kapp->eventLoop()->exitLoop();
   }
 }
 
-- 
cgit v1.2.1