screensaver: Reset internal state for new sessions, don't set the

state in wayland sessions.

Author: mtwebster

js/ui/main.js

@@ -539,6 +539,14 @@ function start() {
         }
     });
 
+    if (!global.session_running || Meta.is_wayland_compositor()) {
+        // If the session is *not* already running, clear the internal locked
+        // state. This is used in x11 sessions to restore the screensaver after
+        // cinnamon restarts. Wayland doesn't support restarts (yet) so it should
+        // always be false.
+        global.settings.set_boolean("session-locked-state", false);
+    }
+
     _screensaverSettings = new Gio.Settings({ schema_id: 'org.cinnamon.desktop.screensaver' });
 
     // The internal screensaver is the only option for wayland sessions. X11 sessions can use either

js/ui/screensaver/screenShield.js

@@ -223,7 +223,7 @@ var ScreenShield = GObject.registerClass({
 
         let locked = newState === State.LOCKED || newState === State.UNLOCKING;
         let wasLocked = oldState === State.LOCKED || oldState === State.UNLOCKING;
-        if (locked !== wasLocked) {
+        if (locked !== wasLocked && !Metа.is_wayland_compositor()) {
             global.settings.set_boolean('session-locked-state', locked);
         }