X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/aca3c707df3fe46bc1b50b4b1a8cc8703e3bfc16..39f89141b06c:/src/dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index a3dc80fef..8b6139d92 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -20,11 +20,11 @@
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
+#include "dolphinviewcontainer.h"
 
 #include <applicationadaptor.h>
 #include <kcmdlineargs.h>
 #include <kurl.h>
-#include <QDir>
 #include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :
@@ -69,35 +69,40 @@ void DolphinApplication::refreshMainWindows()
     }
 }
 
-
 int DolphinApplication::newInstance()
 {
-    int exitValue = KUniqueApplication::newInstance();
-
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
-    if (args->count() > 0) {
-        for (int i = 0; i < args->count(); ++i) {
-            openWindow(args->arg(i));
+    static bool first = true;
+
+    const int argsCount = args->count();
+    if ((argsCount > 0) || !first || !isSessionRestored()) {
+        QList<KUrl> urls;
+        for (int i = 0; i < argsCount; ++i) {
+            urls.append(args->url(i));
+        }
+
+        DolphinMainWindow* win = createMainWindow();
+        if (urls.count() > 0) {
+            if (args->isSet("select")) {
+                win->openFiles(urls);
+            } else {
+                win->openDirectories(urls);
+            }
         }
-    } else {
-        openWindow(QString());
+        win->show();
     }
 
+    first = false;
     args->clear();
-
-    return exitValue;
+    return 0;
 }
 
-int DolphinApplication::openWindow(const QString& url)
+int DolphinApplication::openWindow(const QString& urlString)
 {
-    QString dir = url;
-    if (dir == ".") {
-        dir = QDir::currentPath();
-    }
-
     DolphinMainWindow* win = createMainWindow();
-    if ((win->activeView() != 0) && !dir.isEmpty()) {
-        win->activeView()->setUrl(KUrl(dir));
+    const KUrl url(urlString);
+    if (!url.isEmpty()) {
+        win->openDirectories(QList<KUrl>() << url);
     }
     win->show();
     return win->getId();