X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/be9746e87bb6a42e641dbf36c528a60fb564420a..aa44f45ff59c7f2ea44e1d887178b7c3e6e805af:/src/dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index e0e1c5940..4bec27492 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -26,6 +26,7 @@
 #include <kcmdlineargs.h>
 #include <kurl.h>
 #include <QtDBus/QDBusConnection>
+#include <QtCore/QDir>
 
 DolphinApplication::DolphinApplication() :
     m_lastId(0)
@@ -72,20 +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)