Protect live state during restore and reset

config/dot/quickshell/services/SettingsBackup.qml

@@ -38,6 +38,10 @@ Singleton {
     property var initializeHome: function(ids) { HomePreferences.initialize(ids); }
     property var aliasHome: function(id, alias) { HomePreferences.setAlias(id, alias); }
     property var reloadDesktop: function() { DesktopPreferences.reload(); }
+    property var readDisplays: function() { return DesktopPreferences.get("displays"); }
+    property var protectDisplays: function(value) { return DesktopPreferences.set("displays", value); }
+    property var displayBusy: function() { return Displays.busy || Displays.awaitingConfirmation; }
+    property var setDisplayBlocked: function(blocked) { Displays.externalChangeBlocked = blocked; }
     property var applyCompositor: function() { SystemSettings.applyPersistedDisplayPolicy(); }
     property var reloadKeybinds: function() { Keybinds.applyReload(); }
     property var keybindsReloading: function() { return Keybinds.reloading; }
@@ -47,6 +51,7 @@ Singleton {
     }
     property var applyWallpaper: function(path) { Wallpaper.set(path); }
     property var reloadShell: function() { Quickshell.reload(false); }
+    property var protectedDisplays: ({})
 
     readonly property bool busy: listQuery.running || actionRun.running
         || applyRestoredState.running || settleReload.running
@@ -81,6 +86,10 @@ Singleton {
                 root.lastError = actionRun.restoring
                     ? "That snapshot could not be restored."
                     : "The settings could not be backed up.";
+                if (actionRun.restoring) {
+                    root.setDisplayBlocked(false);
+                    root.protectedDisplays = ({});
+                }
                 return;
             }
             root.lastAction = actionRun.restoring ? "restored" : "saved";
@@ -89,6 +98,10 @@ Singleton {
                 root.lastError = homeReloaded
                     ? ""
                     : "Desktop settings were restored, but Home favourites could not be reloaded.";
+                if (!homeReloaded) {
+                    root.setDisplayBlocked(false);
+                    root.protectedDisplays = ({});
+                }
             } else
                 root.lastError = "";
             root.refresh();
@@ -124,6 +137,8 @@ Singleton {
             // from leaving restored Home state stale indefinitely.
             if ((!root.keybindsReloading() && !root.systemBusy()) || attempts >= 30) {
                 stop();
+                root.setDisplayBlocked(false);
+                root.protectedDisplays = ({});
                 root.reloadShell();
             }
         }
@@ -162,6 +177,8 @@ Singleton {
         if (!root.reloadHomeState(text))
             return false;
         root.reloadDesktop();
+        if (!root.protectDisplays(root.protectedDisplays))
+            return false;
         applyRestoredState.restart();
         return true;
     }
@@ -222,10 +239,18 @@ Singleton {
     function restore(name: string): bool {
         if (actionRun.running)
             return false;
+        if (root.displayBusy()) {
+            root.lastError = "Finish the current display change before restoring settings.";
+            return false;
+        }
         if (!root.snapshots.some(snapshot => snapshot.name === name)) {
             root.lastError = "That snapshot is not in the list.";
             return false;
         }
+        const currentDisplays = root.readDisplays();
+        root.protectedDisplays = JSON.parse(JSON.stringify(
+            currentDisplays && typeof currentDisplays === "object" ? currentDisplays : {}));
+        root.setDisplayBlocked(true);
         actionRun.restoring = true;
         actionRun.exec([root.helperPath, "restore", name]);
         return true;