diff options
| author | Elvis Angelaccio <[email protected]> | 2019-12-24 18:28:26 +0100 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2020-03-16 22:38:40 +0100 |
| commit | fa806d48dafec0c47141381740a5d7604293d32d (patch) | |
| tree | e1813504cbb2d4b1d9cfe0334e50863b829936f4 /src/global.cpp | |
| parent | 405dd624fb6b708eea8ec82ef913fe820c51c654 (diff) | |
Exclude daemonized processes from Dolphin::attachToExistingInstance()
Summary:
`dolphin --daemon` does not have the `/dolphin/Dolphin_1` dbus path,
because it doesn't have any DolphinMainWindow.
Instead of working around this issue (as we did in D21666 and D25510),
just exclude these processes from the list of dbus instances checked by
`Dolphin::attachToExistingInstance()`.
CCBUG: 408244
Test Plan: Same test plan as in D21666 and D25510
Reviewers: #dolphin
Subscribers: kfm-devel
Tags: #dolphin
Differential Revision: https://phabricator.kde.org/D26213
Diffstat (limited to 'src/global.cpp')
| -rw-r--r-- | src/global.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/global.cpp b/src/global.cpp index 9aff25b26..34ed4e824 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -82,7 +82,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi QSharedPointer<QDBusInterface> preferredInterface( new QDBusInterface(preferredService, QStringLiteral("/dolphin/Dolphin_1"), - QString()) // #414402: use empty interface name to prevent QtDBus from caching the interface. + QStringLiteral("org.kde.dolphin.MainWindow")) ); if (preferredInterface->isValid() && !preferredInterface->lastError().isValid()) { dolphinInterfaces.append(qMakePair(preferredInterface, QStringList())); |