diff options
Diffstat (limited to 'core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver')
| -rwxr-xr-x | core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver index 8953aa83..4900658e 100755 --- a/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver +++ b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver @@ -16,6 +16,7 @@ if which xscreensaver; then SBY=${SLX_SCREEN_STANDBY_TIMEOUT} if [ -n "${SLX_EXAM}" ]; then SLX_LOGOUT_TIMEOUT=0 + SLX_SCREEN_SAVER_TIMEOUT=0 SBY=0 elif [ -z "$SBY" ]; then SBY=0 @@ -39,9 +40,13 @@ if which xscreensaver; then [ "$SBY" -gt 0 ] && DPMS=True STANDBY="$( secsToTime "$SBY" )" # Explicit screen saver timeout set - TIMEOUT="$( secsToTime "$SLX_SCREEN_SAVER_TIMEOUT" )" + if [ "$SLX_SCREEN_SAVER_TIMEOUT" -gt 0 ]; then + TIMEOUT="$( secsToTime "$SLX_SCREEN_SAVER_TIMEOUT" )" + else + TIMEOUT="99:00:00" + fi if [ -z "$SLX_SCREEN_SAVER_GRACE_TIME" ]; then - GRACE="00:00:15" + GRACE="99:00:00" else GRACE="$( secsToTime "$SLX_SCREEN_SAVER_GRACE_TIME" )" fi |