┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/global.cpp
diff options
context:
space:
mode:
authorElvis Angelaccio <[email protected]>2021-08-29 19:42:51 +0200
committerElvis Angelaccio <[email protected]>2021-08-29 19:42:51 +0200
commit8b4d3624ad1be3de678cc5fcaa5a6baa43767914 (patch)
treefd171066c5432dcfaa452451db8a3184a1e09b29 /src/global.cpp
parent05448c4dea3758c89e89c16315f5bd29874a9df8 (diff)
parent127e446ba09c1294f57e50bcfc574b6c8a311370 (diff)
Merge branch 'release/21.08'
Diffstat (limited to 'src/global.cpp')
-rw-r--r--src/global.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/global.cpp b/src/global.cpp
index e81b7d34d..0712aa173 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -90,16 +90,14 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
newUrls.append(url);
}
}
- dolphinInterfaces.front().second << newUrls;
for (const auto& interface: qAsConst(dolphinInterfaces)) {
- if (!interface.second.isEmpty()) {
- auto reply = openFiles ? interface.first->openFiles(interface.second, splitView) : interface.first->openDirectories(interface.second, splitView);
- reply.waitForFinished();
- if (!reply.isError()) {
- interface.first->activateWindow();
- attached = true;
- }
+ auto reply = openFiles ? interface.first->openFiles(newUrls, splitView) : interface.first->openDirectories(newUrls, splitView);
+ reply.waitForFinished();
+ if (!reply.isError()) {
+ interface.first->activateWindow();
+ attached = true;
+ break;
}
}
return attached;