Do not match daemonized dolphin instances

[dolphin.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index e7ff67d776578cfa88368e1177b99b1e94c77b91..73e154b3a035985203a05cc0fdd969b2b0b9c314 100644 (file)
--- 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
 {
     if (KWindowSystem::isPlatformWayland()) {
         // TODO: once Wayland clients can raise or activate themselves remove this conditional


@@ -81,7 +81,8 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& urls, bool openFiles,
 
     // Don't match the service without trailing "-" (unique instance)
     const QString pattern = QStringLiteral("org.kde.dolphin-");
 
     // Don't match the service without trailing "-" (unique instance)
     const QString pattern = QStringLiteral("org.kde.dolphin-");

-    const QString myPid = QString::number(QCoreApplication::applicationPid());
+    // Don't match the pid without leading "-"
+    const QString myPid = QStringLiteral("-") + QString::number(QCoreApplication::applicationPid());

     QVector<QPair<QSharedPointer<QDBusInterface>, QStringList>> dolphinServices;
     if (!preferredService.isEmpty()) {
         QSharedPointer<QDBusInterface> preferred(
     QVector<QPair<QSharedPointer<QDBusInterface>, QStringList>> dolphinServices;
     if (!preferredService.isEmpty()) {
         QSharedPointer<QDBusInterface> preferred(


@@ -103,7 +104,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& urls, bool openFiles,
                 QStringLiteral("/dolphin/Dolphin_1"),
                 QStringLiteral("org.kde.dolphin.MainWindow"))
             );
                 QStringLiteral("/dolphin/Dolphin_1"),
                 QStringLiteral("org.kde.dolphin.MainWindow"))
             );

-            if (!instance->isValid()) {
+            if (!instance->isValid() || instance->lastError().isValid()) {

                 continue;
             }
             dolphinServices.append(qMakePair(instance, QStringList()));
                 continue;
             }
             dolphinServices.append(qMakePair(instance, QStringList()));


@@ -117,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
     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);
         bool urlFound = false;
         for (auto& service: dolphinServices) {
             QDBusReply<bool> isUrlOpen = service.first->call(QStringLiteral("isUrlOpen"), url);