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
This commit is contained in:
Elvis Angelaccio 2019-06-10 22:13:12 +02:00
parent d886cf3c85
commit 7df5fc8edb

View file

@ -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()));