From: Luboš Luňák <l.lunak@kde.org>
Date: Tue, 22 Jan 2008 18:06:28 +0000 (+0000)
Subject: - fix session restore
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c624666b53b678de541ca2946565eaecefb52a4c

- fix session restore
- newInstance() from KUniqueApplication is actually harmful here


svn path=/branches/KDE/4.0/kdebase/apps/; revision=764846
---

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index ea18db132..4bec27492 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -73,21 +73,21 @@ void DolphinApplication::refreshMainWindows()
 
 int DolphinApplication::newInstance()
 {
-    int exitValue = KUniqueApplication::newInstance();
-
     KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    static bool first = true;
     if (args->count() > 0) {
         for (int i = 0; i < args->count(); ++i) {
             openWindow(args->url(i));
         }
-    } else {
+    } else if( !first || !isSessionRestored()) {
         openWindow(KUrl());
     }
+    first = false;
 
     args->clear();
 
-    return exitValue;
+    return 0;
 }
 
 int DolphinApplication::openWindow(const KUrl& url)