main.js: Only allow the internal screensaver for wayland sessions.

mtwebster · mtwebster · commit 0bb7308efe24 · 2026-02-24T11:28:45.000-05:00
diff --git a/js/ui/main.js b/js/ui/main.js
@@ -534,7 +534,9 @@ function start() {
 
     _screensaverSettings = new Gio.Settings({ schema_id: 'org.cinnamon.desktop.screensaver' });
 
-    if (global.settings.get_boolean('internal-screensaver-enabled')) {
+    // The internal screensaver is the only option for wayland sessions. X11 sessions can use either
+    // the internal one or cinnamon-screensaver (>= 6.7).
+    if (Meta.is_wayland_compositor() || global.settings.get_boolean('internal-screensaver-enabled')) {
         _screenShield = new ScreenShield.ScreenShield();
         new ScreenSaver.ScreenSaverService(_screenShield);
     }

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,9 @@ function start() {`
`534`	`534`
`535`	`535`	`_screensaverSettings = new Gio.Settings({ schema_id: 'org.cinnamon.desktop.screensaver' });`
`536`	`536`
`537`		`- if (global.settings.get_boolean('internal-screensaver-enabled')) {`
	`537`	`+ // The internal screensaver is the only option for wayland sessions. X11 sessions can use either`
	`538`	`+ // the internal one or cinnamon-screensaver (>= 6.7).`
	`539`	`+ if (Meta.is_wayland_compositor() \|\| global.settings.get_boolean('internal-screensaver-enabled')) {`
`538`	`540`	`_screenShield = new ScreenShield.ScreenShield();`
`539`	`541`	`new ScreenSaver.ScreenSaverService(_screenShield);`
`540`	`542`	`}`