fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-28 07:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dix: restore lastDeviceEventTime update in dixSaveScreens

Browse source 
This was removed in 6b5978dcf1 (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 001ce71dc1)

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Julien Cristau 2010-02-12 23:34:57 +01:00 • committed by Peter Hutterer
parent 38a83dce23
commit 15e9a3fc0c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dix/window.c
View file

@ -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;
}