]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/19.08'
authorNate Graham <nate@kde.org>
Sun, 25 Aug 2019 16:36:26 +0000 (10:36 -0600)
committerNate Graham <nate@kde.org>
Sun, 25 Aug 2019 16:36:26 +0000 (10:36 -0600)
src/main.cpp

index 10adfc638b05cd4d91ba1816d587bbccb0c4108f..8981b54bce36013e77ef5744e6c235f512f81f52 100644 (file)
@@ -142,11 +142,6 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         return app.exec();
     }
 
-    if (splitView && urls.size() < 2) {
-        // Split view does only make sense if we have at least 2 URLs
-        urls.append(urls.last());
-    }
-
     if (!parser.isSet(QStringLiteral("new-window"))) {
         if (Dolphin::attachToExistingInstance(urls, openFiles, splitView)) {
             // Successfully attached to existing instance of Dolphin
@@ -159,6 +154,11 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         urls.append(Dolphin::homeUrl());
     }
     
+    if (splitView && urls.size() < 2) {
+        // Split view does only make sense if we have at least 2 URLs
+        urls.append(urls.last());
+    }
+    
     DolphinMainWindow* mainWindow = new DolphinMainWindow();
 
     if (openFiles) {