aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2018-07-03 14:48:43 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-07-03 15:26:15 +0200
commit7401a6691a9a3cd77431466b941eaf169c9b2b2c (patch)
tree8d8038bd610d3068ca03e840abd252c5bd08a374 /nx-X11/programs/Xserver
parent14f734873d2b2c5d96d563482384a996c50f1068 (diff)
downloadnx-libs-7401a6691a9a3cd77431466b941eaf169c9b2b2c.tar.gz
nx-libs-7401a6691a9a3cd77431466b941eaf169c9b2b2c.tar.bz2
nx-libs-7401a6691a9a3cd77431466b941eaf169c9b2b2c.zip
Do not reset lastDeviceEventTime when we do dixSaveScreens
Backported from X.org's Xserver: commit 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 Author: Richard Hughes <richard@hughsie.com> Date: Mon Aug 17 09:15:32 2009 +0100 Do not reset lastDeviceEventTime when we do dixSaveScreens When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the event time else session clients using IDLETIME will be reset. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/dix/window.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c
index 300c1a7fc..79045767f 100644
--- a/nx-X11/programs/Xserver/dix/window.c
+++ b/nx-X11/programs/Xserver/dix/window.c
@@ -3348,8 +3348,6 @@ SaveScreens(int on, int mode)
if (on == SCREEN_SAVER_FORCER)
{
- UpdateCurrentTimeIf();
- lastDeviceEventTime = currentTime;
if (mode == ScreenSaverReset)
what = SCREEN_SAVER_OFF;
else