[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/src
From:       David Faure <faure () kde ! org>
Date:       2009-10-01 16:03:40
Message-ID: 1254413020.945627.14743.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1030125 by dfaure:

Simplify now that KRun takes care of the timer automatically.


 M  +4 -14     konqrun.cpp  


--- trunk/KDE/kdebase/apps/konqueror/src/konqrun.cpp #1030124:1030125
@@ -73,9 +73,8 @@
 
     // Check if the main window wasn't deleted meanwhile
     if (!m_pMainWindow) {
-        setFinished(true);
         setError(true);
-        timer().start(0);
+        setFinished(true);
         return;
     }
 
@@ -128,14 +127,10 @@
         }
     }
 
-    if (hasFinished()) {
-        m_pMainWindow = 0L;
-        timer().start(0);
-        return;
+    if (!hasFinished()) {
+        kDebug() << "Nothing special to do in KonqRun, falling back to KRun";
+        KRun::foundMimeType(mimeType);
     }
-
-    kDebug() << "Nothing special to do in KonqRun, falling back to KRun";
-    KRun::foundMimeType(mimeType);
 }
 
 bool KonqRun::tryOpenView(const QString& mimeType, bool associatedAppIsKonqueror)
@@ -157,11 +152,6 @@
 
     const bool ok = m_pMainWindow->openView(mimeType, KRun::url(), m_pView, m_req);
     setFinished(ok);
-
-    if (ok) {
-        m_pMainWindow = 0;
-        timer().start(0);
-    }
     return ok;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]