diff --git a/src/global.cpp b/src/global.cpp index cd1409d9e0..c9ec6a1200 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -60,7 +60,7 @@ bool Dolphin::attachToExistingInstance(const QList& inputUrls, bool openFi { bool attached = false; - if (inputUrls.isEmpty() || !GeneralSettings::openExternallyCalledFolderInNewTab()) { + if (inputUrls.isEmpty()) { return false; } @@ -81,19 +81,20 @@ bool Dolphin::attachToExistingInstance(const QList& 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 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->isItemVisibleInAnyView(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; } @@ -103,7 +104,11 @@ bool Dolphin::attachToExistingInstance(const QList& 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); + } } } @@ -120,6 +125,14 @@ bool Dolphin::attachToExistingInstance(const QList& inputUrls, bool openFi attached = true; } } + if (attached && !newWindowURLs.isEmpty()) { + if (openFiles) { + openNewWindow(newWindowURLs, nullptr, Dolphin::OpenNewWindowFlag::Select); + } else { + openNewWindow(newWindowURLs); + } + } + return attached; }