Change default Dolphin toolbar layout

[dolphin.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index d39d202a2300ca0e7fde5a87f28d1ffa1e4204ea..12f86a2f369ace55f2dc082acdee69a09f6e479c 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -84,7 +84,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
             QStringLiteral("/dolphin/Dolphin_1"),
             QStringLiteral("org.kde.dolphin.MainWindow"))
         );
             QStringLiteral("/dolphin/Dolphin_1"),
             QStringLiteral("org.kde.dolphin.MainWindow"))
         );

-        if (preferred->isValid()) {
+        if (preferred->isValid() && !preferred->lastError().isValid()) {

             dolphinServices.append(qMakePair(preferred, QStringList()));
         }
     }
             dolphinServices.append(qMakePair(preferred, QStringList()));
         }
     }


@@ -103,10 +103,9 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
                 QStringLiteral("/dolphin/Dolphin_1"),
                 QStringLiteral("org.kde.dolphin.MainWindow"))
             );
                 QStringLiteral("/dolphin/Dolphin_1"),
                 QStringLiteral("org.kde.dolphin.MainWindow"))
             );

-            if (!instance->isValid() || instance->lastError().isValid()) {
-                continue;
+            if (instance->isValid() && !instance->lastError().isValid()) {
+                dolphinServices.append(qMakePair(instance, QStringList()));

             }
             }

-            dolphinServices.append(qMakePair(instance, QStringList()));

         }
     }
 
         }
     }