diff options
| author | Simon Rettberg | 2019-04-25 13:32:58 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-04-25 13:32:58 +0200 |
| commit | b9755f9ceb8adae5ad557094c7ccae9064a44635 (patch) | |
| tree | a12b48de92d4ef79145d9d5c1b2a120331e7bd21 /core/modules/xscreensaver | |
| parent | [kexec-reboot] Remove duplicate file (diff) | |
| download | mltk-b9755f9ceb8adae5ad557094c7ccae9064a44635.tar.gz mltk-b9755f9ceb8adae5ad557094c7ccae9064a44635.tar.xz mltk-b9755f9ceb8adae5ad557094c7ccae9064a44635.zip | |
[xscreensaver] Don't play guessing games if TIMEOUT is set but empty
Diffstat (limited to 'core/modules/xscreensaver')
| -rwxr-xr-x | core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver | 8 |
1 files changed, 4 insertions, 4 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 4172d8da..c8eb88ca 100755 --- a/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver +++ b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver @@ -38,7 +38,10 @@ if which xscreensaver; then # Create config value for standby timeout [ "$SBY" -gt 0 ] && DPMS=True STANDBY="$( secsToTime "$SBY" )" - if [ -z "$SLX_SCREEN_SAVER_TIMEOUT" ]; then + if [ -v SLX_SCREEN_SAVER_TIMEOUT ]; then + # Explicit screen saver timeout set + TIMEOUT="$( secsToTime "$SLX_SCREEN_SAVER_TIMEOUT" )" + else # Create config for screensaver activation timeout if [ "$SLX_LOGOUT_TIMEOUT" -gt 0 ] && [ "$SBY" -eq 0 ]; then # Standby is disabled, consider logout timeout @@ -55,9 +58,6 @@ if which xscreensaver; then else TIMEOUT="99:00:00" fi - else - # Explicit screen saver timeout set - TIMEOUT="$( secsToTime "$SLX_SCREEN_SAVER_TIMEOUT" )" fi if [ -z "$SLX_SCREEN_SAVER_GRACE_TIME" ]; then GRACE="00:00:15" |