fix opening new windows unnecessary

[dolphin.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index 5d6d90b59e16259dc2d2c6e610c5e274a23babba..c9ec6a1200036caaa1b7e6fb15bb6f516bc7e709 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -15,10 +15,8 @@
 #include <KDialogJobUiDelegate>
 #include <KIO/ApplicationLauncherJob>
 #include <KService>
-#include <KWindowSystem>
 
 #include <QApplication>
-#include <QIcon>
 
 QList<QUrl> Dolphin::validateUris(const QStringList& uriList)
 {
@@ -62,7 +60,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
 {
     bool attached = false;
 
-    if (inputUrls.isEmpty() || !GeneralSettings::openExternallyCalledFolderInNewTab()) {
+    if (inputUrls.isEmpty()) {
         return false;
     }
 
@@ -83,19 +81,20 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
     }
 
     // check to see if any instances already have any of the given URLs or their parents open
-    const auto urls = QUrl::toStringList(inputUrls);
-    for (const QString& url : urls) {
+    QList<QUrl> newWindowURLs;
+    for (const QUrl& url : inputUrls) {
         bool urlFound = false;
+        const QString urlString = url.toString();
 
         // looping through the windows starting from the active one
         int i = activeWindowIndex;
         do {
             auto &interface = dolphinInterfaces[i];
 
-            auto isUrlOpenReply = openFiles ? interface.first->isUrlOrParentOpen(url) : interface.first->isUrlOpen(url);
+            auto isUrlOpenReply = openFiles ? interface.first->isItemVisibleInAnyView(urlString) : interface.first->isUrlOpen(urlString);
             isUrlOpenReply.waitForFinished();
             if (!isUrlOpenReply.isError() && isUrlOpenReply.value()) {
-                interface.second.append(url);
+                interface.second.append(urlString);
                 urlFound = true;
                 break;
             }
@@ -105,7 +104,11 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
         while (i != activeWindowIndex);
 
         if (!urlFound) {
-            dolphinInterfaces[activeWindowIndex].second.append(url);
+            if (GeneralSettings::openExternallyCalledFolderInNewTab()) {
+                dolphinInterfaces[activeWindowIndex].second.append(urlString);
+            } else {
+                newWindowURLs.append(url);
+            }
         }
     }
 
@@ -122,6 +125,14 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
             attached = true;
         }
     }
+    if (attached && !newWindowURLs.isEmpty()) {
+        if (openFiles) {
+            openNewWindow(newWindowURLs, nullptr, Dolphin::OpenNewWindowFlag::Select);
+        } else {
+            openNewWindow(newWindowURLs);
+        }
+    }
+
     return attached;
 }