From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sun, 11 Aug 2019 14:01:41 +0000 (+0200)
Subject: Merge branch 'Applications/19.08'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/87f30d3fc8172649b3c905b04e20655ca18ac68f

Merge branch 'Applications/19.08'
---

87f30d3fc8172649b3c905b04e20655ca18ac68f
diff --cc src/global.cpp
index d39d202a2,21660a828..64282e711
--- a/src/global.cpp
+++ b/src/global.cpp
@@@ -84,8 -90,8 +84,8 @@@ bool Dolphin::attachToExistingInstance(
              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()));
          }
      }