diff options
| author | Simon Rettberg | 2020-12-02 08:35:55 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2020-12-02 08:35:55 +0100 |
| commit | e5319b91d163384ee22db077b2d37688d65646c9 (patch) | |
| tree | 04acbf822516634814098b38a9878ffc1a55529d /driver/timers.c | |
| parent | driver/timers.c: fix flush_events() (diff) | |
| parent | 5.44 (diff) | |
| download | xscreensaver-e5319b91d163384ee22db077b2d37688d65646c9.tar.gz xscreensaver-e5319b91d163384ee22db077b2d37688d65646c9.tar.xz xscreensaver-e5319b91d163384ee22db077b2d37688d65646c9.zip | |
Merge branch 'master' into openslx
Diffstat (limited to 'driver/timers.c')
| -rw-r--r-- | driver/timers.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/driver/timers.c b/driver/timers.c index 9c18a8e..b096000 100644 --- a/driver/timers.c +++ b/driver/timers.c @@ -1,5 +1,5 @@ /* timers.c --- detecting when the user is idle, and other timer-related tasks. - * xscreensaver, Copyright (c) 1991-2017 Jamie Zawinski <jwz@jwz.org> + * xscreensaver, Copyright (c) 1991-2019 Jamie Zawinski <jwz@jwz.org> * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -311,6 +311,12 @@ activate_lock_timer (XtPointer closure, XtIntervalId *id) if (p->verbose_p) fprintf (stderr, "%s: timed out; activating lock.\n", blurb()); + + if (!si->locked_p) + /* So that "xscreensaver-command -watch" reports the time that the + screen was locked, instead of duplicating the blank time. */ + si->blank_time = time ((time_t *) 0); + set_locked_p (si, True); } |