Open new instance of Dolphin if no URLs are given

[dolphin.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index 995cad5594f7acdc53560b67b0c90eb10558dd64..42044c97dc6b4aab31467ecc1e42e40f01e28eea 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -72,8 +72,8 @@ void Dolphin::openNewWindow(const QList<QUrl> &urls, QWidget *window, const Open
 
 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
+    // TODO: once Wayland clients can raise or activate themselves remove check from conditional
+    if (KWindowSystem::isPlatformWayland() || inputUrls.isEmpty()) {
         return false;
     }
 
@@ -104,7 +104,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
                 QStringLiteral("/dolphin/Dolphin_1"),
                 QStringLiteral("org.kde.dolphin.MainWindow"))
             );
-            if (!instance->isValid()) {
+            if (!instance->isValid() || instance->lastError().isValid()) {
                 continue;
             }
             dolphinServices.append(qMakePair(instance, QStringList()));