mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-06-23 11:35:25 -04:00
fix(greeter): restore legacy remembered sessions by desktop id
- 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:
@@ -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")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1903,7 +1903,7 @@ Item {
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
const savedSession = GreetdSettings.rememberLastSession ? GreetdMemory.lastSessionId : "";
|
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) {
|
if ((savedSession || savedDesktopId) && GreetdSettings.rememberLastSession) {
|
||||||
for (var i = 0; i < GreeterState.sessionPaths.length; i++) {
|
for (var i = 0; i < GreeterState.sessionPaths.length; i++) {
|
||||||
if ((savedDesktopId && GreeterState.sessionDesktopIds[i] === savedDesktopId) || (savedSession && GreeterState.sessionPaths[i] === savedSession)) {
|
if ((savedDesktopId && GreeterState.sessionDesktopIds[i] === savedDesktopId) || (savedSession && GreeterState.sessionPaths[i] === savedSession)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user