40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
|
From fae71841ff018e34bbb02aa1098b53f63c1743d2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fushan Wen <qydwhotmail@gmail.com>
|
||
|
|
Date: Tue, 17 Sep 2024 07:53:35 +0000
|
||
|
|
Subject: [PATCH] startkde: Fix wayland session restore saving
|
||
|
|
|
||
|
|
When we added manual saving support to plasma-shutdown a guard was
|
||
|
|
changed in the normal shutdown path. This guard was wrong, we want to
|
||
|
|
check we're in the restorePreviousLogout path here.
|
||
|
|
|
||
|
|
This amends 804976c5ecec1fbf5f6e7e09970a8269bdf748d2
|
||
|
|
|
||
|
|
BUG: 436318
|
||
|
|
|
||
|
|
|
||
|
|
(cherry picked from commit 4dff1973116597210cf9fb1c102e5c9433d13b1d)
|
||
|
|
|
||
|
|
89ee67ad startkde: Fix wayland session restore saving
|
||
|
|
|
||
|
|
Co-authored-by: David Edmundson <kde@davidedmundson.co.uk>
|
||
|
|
---
|
||
|
|
startkde/plasma-shutdown/shutdown.cpp | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/startkde/plasma-shutdown/shutdown.cpp b/startkde/plasma-shutdown/shutdown.cpp
|
||
|
|
index 11c002bcd80..ab93cca6ef7 100644
|
||
|
|
--- a/startkde/plasma-shutdown/shutdown.cpp
|
||
|
|
+++ b/startkde/plasma-shutdown/shutdown.cpp
|
||
|
|
@@ -84,7 +84,7 @@ void Shutdown::ksmServerComplete()
|
||
|
|
{
|
||
|
|
const KConfigGroup c(KSharedConfig::openConfig(QStringLiteral("ksmserverrc")), QStringLiteral("General"));
|
||
|
|
|
||
|
|
- if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restoreSavedSession")) {
|
||
|
|
+ if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restorePreviousLogout")) {
|
||
|
|
// Now record windows that are not session managed
|
||
|
|
int ret = QProcess::execute(QStringLiteral(PLASMA_FALLBACK_SESSION_SAVE_BIN));
|
||
|
|
if (ret) {
|
||
|
|
--
|
||
|
|
GitLab
|
||
|
|
|