]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/19.08'
authorElvis Angelaccio <elvis.angelaccio@kde.org>
Sun, 11 Aug 2019 14:01:41 +0000 (16:01 +0200)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Sun, 11 Aug 2019 14:01:41 +0000 (16:01 +0200)
1  2 
src/global.cpp

diff --cc src/global.cpp
index d39d202a2300ca0e7fde5a87f28d1ffa1e4204ea,21660a8281a66311216c0a0e41cd314720027b36..64282e711de29956fad1e216b77cfe99c5d8f184
@@@ -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()));
          }
      }