┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElvis Angelaccio <[email protected]>2019-06-10 22:13:12 +0200
committerElvis Angelaccio <[email protected]>2019-06-10 22:13:12 +0200
commit7df5fc8edb54153f877eed4690e77968a1b804ba (patch)
tree463c34b326b92e9cad048dc9ca50b32e24827c0e
parentd886cf3c85ebf536401b8a73a1d4ddbe51b78a0f (diff)
Do not match daemonized dolphin instances
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. BUG: 408244 Test Plan: 1. Make sure there is a `dolphin --deamon` process around. 2. Start another dolphin process. Reviewers: broulik, ngraham, feverfew Reviewed By: feverfew Subscribers: kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D21666
-rw-r--r--src/global.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/global.cpp b/src/global.cpp
index 995cad559..73e154b3a 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -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()));