diff options
| author | Julien Cristau <jcristau@debian.org> | 2010-02-12 23:34:57 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-02-16 11:30:46 +1000 |
| commit | 15e9a3fc0c4776f3ff02a59375e61d9090e35a22 (patch) | |
| tree | ca54a1ba2857484ab0830e3302cd3d68c0e8465a | |
| parent | 38a83dce236da44856c075b5589d38ef0a662d4b (diff) | |
dix: restore lastDeviceEventTime update in dixSaveScreens
This was removed in 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 (Do not
reset lastDeviceEventTime when we do dixSaveScreens), but caused a
regression for XResetScreenSaver. Add the lastDeviceEventTime update
back, but restrict it to that case.
X.Org bug#25855 <http://bugs.freedesktop.org/25855>
Reported-by: Lubos Lunak <l.lunak@suse.cz>
Tested-by: Lubos Lunak <l.lunak@suse.cz>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 001ce71dc11287dc94cc2fbc5d35677c046e6c04)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | dix/window.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/dix/window.c b/dix/window.c index caff1cbff..2676a546a 100644 --- a/dix/window.c +++ b/dix/window.c @@ -3233,8 +3233,13 @@ dixSaveScreens(ClientPtr client, int on, int mode) } } screenIsSaved = what; - if (mode == ScreenSaverReset) - SetScreenSaverTimer(); + if (mode == ScreenSaverReset) { + if (on == SCREEN_SAVER_FORCER) { + UpdateCurrentTimeIf(); + lastDeviceEventTime = currentTime; + } + SetScreenSaverTimer(); + } return Success; } |