X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/0bc919bd4758a84ccc0928ff784223984ec5df88..7df5fc8edb54153f:/src/global.cpp?ds=sidebyside

diff --git a/src/global.cpp b/src/global.cpp
index 97d743438..73e154b3a 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -70,7 +70,7 @@ void Dolphin::openNewWindow(const QList<QUrl> &urls, QWidget *window, const Open
     );
 }
 
-bool Dolphin::attachToExistingInstance(const QList<QUrl>& urls, bool openFiles, bool splitView, const QString& preferredService)
+bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFiles, bool splitView, const QString& preferredService)
 {
     if (KWindowSystem::isPlatformWayland()) {
         // TODO: once Wayland clients can raise or activate themselves remove this conditional
@@ -104,7 +104,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& urls, bool openFiles,
                 QStringLiteral("/dolphin/Dolphin_1"),
                 QStringLiteral("org.kde.dolphin.MainWindow"))
             );
-            if (!instance->isValid()) {
+            if (!instance->isValid() || instance->lastError().isValid()) {
                 continue;
             }
             dolphinServices.append(qMakePair(instance, QStringList()));
@@ -118,7 +118,8 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& urls, bool openFiles,
     QStringList newUrls;
 
     // check to see if any instances already have any of the given URLs open
-    for (const QString& url : QUrl::toStringList(urls)) {
+    const auto urls = QUrl::toStringList(inputUrls);
+    for (const QString& url : urls) {
         bool urlFound = false;
         for (auto& service: dolphinServices) {
             QDBusReply<bool> isUrlOpen = service.first->call(QStringLiteral("isUrlOpen"), url);