┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElvis Angelaccio <[email protected]>2019-08-11 12:10:43 +0200
committerElvis Angelaccio <[email protected]>2019-08-11 12:18:53 +0200
commitaeba47648d8b4b43ad0f8e237cfc95b8a4bd60ac (patch)
treee8ba8c2641b2482b7dc6870c9663cb7920e11fb9
parent40bc9531c576848cbafc637a26a66473fcbbc85d (diff)
Do not match daemonized dolphin instances: part 2
Summary: `dolphin --daemon` does not have the `/dolphin/Dolphin_1` dbus path, because it doesn't have any DolphinMainWindow. Checking if the QDBusInterface is valid is not enough, we also need to look for dbus errors. This should have been part of commit 7df5fc8edb54153f. Not sure how I missed it. BUG: 408244 FIXED-IN: 19.08.0 Test Plan: 1. Make sure the new "Open new folders in tabs" setting is enabled. 2. Run `dolphin --deamon` and make sure is the only dolphin process around. 3. Call the `org.freedesktop.FileManager1.ShowFolders` method from QDbusViewer. Subscribers: kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D23087
-rw-r--r--src/global.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/global.cpp b/src/global.cpp
index 4547faced..21660a828 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -90,7 +90,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
QStringLiteral("/dolphin/Dolphin_1"),
QStringLiteral("org.kde.dolphin.MainWindow"))
);
- if (preferred->isValid()) {
+ if (preferred->isValid() && !preferred->lastError().isValid()) {
dolphinServices.append(qMakePair(preferred, QStringList() ));
}
}