diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-07-03 16:04:16 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-07-03 16:04:16 +0200 |
commit | 9834951239bbbfb24dfc919b7e321e21e14d3222 (patch) | |
tree | 864fef700b80e5174a41df2cabda150c348298ba /nx-X11/programs/Xserver/Xext/dpms.c | |
parent | 72f11ee838e67757e235e7216fb82679cc3f7d67 (diff) | |
parent | 222153af4406e74c9d8a8a752ae220663432905d (diff) | |
download | nx-libs-9834951239bbbfb24dfc919b7e321e21e14d3222.tar.gz nx-libs-9834951239bbbfb24dfc919b7e321e21e14d3222.tar.bz2 nx-libs-9834951239bbbfb24dfc919b7e321e21e14d3222.zip |
Merge branch 'sunweaver-pr/idletime-counter' into 3.6.x
Attributes GH PR #713: https://github.com/ArcticaProject/nx-libs/pull/713
Reviewed by Ulrich Sibiller <uli42@gmx.de> -- Tue, 3 Jul 2018 15:24:31 +0200 (CEST)
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/dpms.c')
-rw-r--r-- | nx-X11/programs/Xserver/Xext/dpms.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/nx-X11/programs/Xserver/Xext/dpms.c b/nx-X11/programs/Xserver/Xext/dpms.c index 74969bb52..81bbd5179 100644 --- a/nx-X11/programs/Xserver/Xext/dpms.c +++ b/nx-X11/programs/Xserver/Xext/dpms.c @@ -232,19 +232,10 @@ ProcDPMSForceLevel(client) if (!DPMSEnabled) return BadMatch; - if (stuff->level == DPMSModeOn) { - lastDeviceEventTime.milliseconds = - GetTimeInMillis(); - } else if (stuff->level == DPMSModeStandby) { - lastDeviceEventTime.milliseconds = - GetTimeInMillis() - DPMSStandbyTime; - } else if (stuff->level == DPMSModeSuspend) { - lastDeviceEventTime.milliseconds = - GetTimeInMillis() - DPMSSuspendTime; - } else if (stuff->level == DPMSModeOff) { - lastDeviceEventTime.milliseconds = - GetTimeInMillis() - DPMSOffTime; - } else { + if (stuff->level != DPMSModeOn && + stuff->level != DPMSModeStandby && + stuff->level != DPMSModeSuspend && + stuff->level != DPMSModeOff) { client->errorValue = stuff->level; return BadValue; } |