Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-06-23 11:35:25 -04:00
Code Packages Releases Activity

fix(greeter): restore legacy remembered sessions by desktop id

Browse Source 
- Derive a desktop id from legacy remembered session paths
- Match remembered sessions by desktop id before falling back to path
This commit is contained in:
purian23
2026-06-22 12:56:45 -04:00
parent 4e1c921ffb
commit b0edccb80e
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/internal/qmlchecks/greeter_session_memory_test.go
+22
View File
@@ -0,0 +1,22 @@
package qmlchecks
import (
"os"
"strings"
"testing"
)
func TestGreeterRememberLastSessionFallsBackToDesktopID(t *testing.T) {
data, err := os.ReadFile("../../../quickshell/Modules/Greetd/GreeterContent.qml")
if err != nil {
t.Fatalf("read greeter QML: %v", err)
}
content := string(data)
if !strings.Contains(content, "GreetdMemory.lastSessionDesktopId || desktopIdFromPath(GreetdMemory.lastSessionId)") {
t.Fatalf("remembered greeter sessions should derive a desktop id from legacy absolute session paths")
}
if !strings.Contains(content, "GreeterState.sessionDesktopIds[i] === savedDesktopId") {
t.Fatalf("remembered greeter sessions should match current sessions by desktop id")
}
}
quickshell/Modules/Greetd/GreeterContent.qml
+1 -1
View File
@@ -1903,7 +1903,7 @@ Item {
return;
const savedSession = GreetdSettings.rememberLastSession ? GreetdMemory.lastSessionId : "";
const savedDesktopId = GreetdSettings.rememberLastSession ? GreetdMemory.lastSessionDesktopId : "";
const savedDesktopId = GreetdSettings.rememberLastSession ? (GreetdMemory.lastSessionDesktopId || desktopIdFromPath(GreetdMemory.lastSessionId)) : "";
if ((savedSession || savedDesktopId) && GreetdSettings.rememberLastSession) {
for (var i = 0; i < GreeterState.sessionPaths.length; i++) {
if ((savedDesktopId && GreeterState.sessionDesktopIds[i] === savedDesktopId) || (savedSession && GreeterState.sessionPaths[i] === savedSession)) {