kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix opening new windows unnecessary

Browse source 
fixes a regression introduced by
https://invent.kde.org/utilities/ark/-/merge_requests/44

BUG: 440663

(backported from commit c628c9d6)


(cherry picked from commit bc38cbd9f0)
This commit is contained in:
Andrey Butirsky 2022-09-29 19:13:15 +03:00
parent 1ed045a968
commit 348794eff8
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/global.cpp
View file

@ -62,7 +62,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
{ {
bool attached = false; bool attached = false;
if (inputUrls.isEmpty() || !GeneralSettings::openExternallyCalledFolderInNewTab()) { if (inputUrls.isEmpty()) {
return false; return false;
} }
@ -83,19 +83,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 // check to see if any instances already have any of the given URLs or their parents open
const auto urls = QUrl::toStringList(inputUrls); QList<QUrl> newWindowURLs;
for (const QString& url : urls) { for (const QUrl& url : inputUrls) {
bool urlFound = false; bool urlFound = false;
const QString urlString = url.toString();
// looping through the windows starting from the active one // looping through the windows starting from the active one
int i = activeWindowIndex; int i = activeWindowIndex;
do { do {
auto &interface = dolphinInterfaces[i]; auto &interface = dolphinInterfaces[i];
auto isUrlOpenReply = openFiles ? interface.first->isUrlOrParentOpen(url) : interface.first->isUrlOpen(url); auto isUrlOpenReply = openFiles ? interface.first->isUrlOrParentOpen(urlString) : interface.first->isUrlOpen(urlString);
isUrlOpenReply.waitForFinished(); isUrlOpenReply.waitForFinished();
if (!isUrlOpenReply.isError() && isUrlOpenReply.value()) { if (!isUrlOpenReply.isError() && isUrlOpenReply.value()) {
interface.second.append(url); interface.second.append(urlString);
urlFound = true; urlFound = true;
break; break;
} }
@ -105,7 +106,11 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
while (i != activeWindowIndex); while (i != activeWindowIndex);
if (!urlFound) { if (!urlFound) {
dolphinInterfaces[activeWindowIndex].second.append(url); if (GeneralSettings::openExternallyCalledFolderInNewTab()) {
dolphinInterfaces[activeWindowIndex].second.append(urlString);
} else {
newWindowURLs.append(url);
}
} }
} }
@ -122,6 +127,14 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
attached = true; attached = true;
} }
} }
if (attached && !newWindowURLs.isEmpty()) {
if (openFiles) {
openNewWindow(newWindowURLs, nullptr, Dolphin::OpenNewWindowFlag::Select);
} else {
openNewWindow(newWindowURLs);
}
}
return attached; return attached;
} }