Fixing bug where split view opens with no URLs

Summary:
BUG: 411193
FIXED-IN: 19.08.1

Test Plan:
Reproduce steps as given in bug report. Observe the exected result.
Used qdbusviewer and ShowFolders method to observe that no regressions occured
in the "open new folders in tabs" feature.

Reviewers: elvisangelaccio, ngraham

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D23445

diff --git a/src/main.cpp b/src/main.cpp
index 10adfc638b05cd4d91ba1816d587bbccb0c4108f..8981b54bce36013e77ef5744e6c235f512f81f52 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -142,11 +142,6 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         return app.exec();
     }
 
         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
     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());
     }
     
         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) {
     DolphinMainWindow* mainWindow = new DolphinMainWindow();
 
     if (openFiles) {