summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-03-24 12:22:19 -0400
committerAdam Jackson <ajax@redhat.com>2008-03-24 12:22:19 -0400
commit536f2ff5382aaaace3b55481e15366bb15d87801 (patch)
tree2933a34c1bf9f99ba86f9e8b9c561abd7dc56672
parent4217ba0cf0c9bbea3774760e836ab372acf3237c (diff)
Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
-rw-r--r--Xext/dpms.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/Xext/dpms.c b/Xext/dpms.c
index 6f01fa348..e3204febb 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -188,12 +188,15 @@ static int
ProcDPMSEnable(client)
register ClientPtr client;
{
- /* REQUEST(xDPMSEnableReq); */
+ Bool was_enabled = DPMSEnabled;
REQUEST_SIZE_MATCH(xDPMSEnableReq);
- if (DPMSCapableFlag)
+ if (DPMSCapableFlag) {
DPMSEnabled = TRUE;
+ if (!was_enabled)
+ SetScreenSaverTimer();
+ }
return(client->noClientException);
}