- 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 ea18db1323b31ab2e8899eeb9c6fb7d2ac96bc97..4bec274927af57c39cb17adadc3ea2ae7745754a 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -73,21 +73,21 @@ void DolphinApplication::refreshMainWindows()
 
 int DolphinApplication::newInstance()
 {
 
 int DolphinApplication::newInstance()
 {

-    int exitValue = KUniqueApplication::newInstance();
-

     KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     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));
         }
     if (args->count() > 0) {
         for (int i = 0; i < args->count(); ++i) {
             openWindow(args->url(i));
         }

-    } else {
+    } else if( !first || !isSessionRestored()) {

         openWindow(KUrl());
     }
         openWindow(KUrl());
     }

+    first = false;

 
     args->clear();
 
 
     args->clear();
 

-    return exitValue;
+    return 0;

 }
 
 int DolphinApplication::openWindow(const KUrl& url)
 }
 
 int DolphinApplication::openWindow(const KUrl& url)