From aaed0138ca8feebb9d45b9c4a2dfd5df651ad972 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Sat, 20 Jun 2020 18:20:04 +0100 Subject: [PATCH] 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 --- startkde/startplasma.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp index 7d8631f5a..a055d5635 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -384,7 +384,7 @@ bool startPlasmaSession(bool wayland) // 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 serviceWatcher.addWatchedService(QStringLiteral("org.kde.ksmserver")); - serviceWatcher.addWatchedService(QStringLiteral("org.kde.shutdown")); + serviceWatcher.addWatchedService(QStringLiteral("org.kde.Shutdown")); serviceWatcher.setWatchMode(QDBusServiceWatcher::WatchForUnregistration); QObject::connect(&startPlasmaSession, QOverload::of(&QProcess::finished), [&rc, &e](int exitCode, QProcess::ExitStatus) {