Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit aaed0138 authored by David Edmundson's avatar David Edmundson Committed by David Edmundson

Fix case of monitored service in startplasma's shutdown

Startplasma monitors ksmserver and tears down the session if it goes
away, to match previous behaviour and as some lockscreen bypass
protection.

When we teardown our new binary plasma-shutdown appears, runs scripts
and makes the final shutdown call. ksmserver could gracefully quit in
the meantime, so startplasma guarded this case and waited till both
names exited. However it contains a really stupid typo.

BUG: 422870
parent 363d32fa
...@@ -384,7 +384,7 @@ bool startPlasmaSession(bool wayland) ...@@ -384,7 +384,7 @@ bool startPlasmaSession(bool wayland)
// We want to exit when both ksmserver and plasma-session-shutdown have finished // We want to exit when both ksmserver and plasma-session-shutdown have finished
// This also closes if ksmserver crashes unexpectedly, as in those cases plasma-shutdown is not running // This also closes if ksmserver crashes unexpectedly, as in those cases plasma-shutdown is not running
serviceWatcher.addWatchedService(QStringLiteral("org.kde.ksmserver")); serviceWatcher.addWatchedService(QStringLiteral("org.kde.ksmserver"));
serviceWatcher.addWatchedService(QStringLiteral("org.kde.shutdown")); serviceWatcher.addWatchedService(QStringLiteral("org.kde.Shutdown"));
serviceWatcher.setWatchMode(QDBusServiceWatcher::WatchForUnregistration); serviceWatcher.setWatchMode(QDBusServiceWatcher::WatchForUnregistration);
QObject::connect(&startPlasmaSession, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), [&rc, &e](int exitCode, QProcess::ExitStatus) { QObject::connect(&startPlasmaSession, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), [&rc, &e](int exitCode, QProcess::ExitStatus) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment