[patch] patch from xfree

dpms.patch (text/plain), 900 bytes, created by Jordan on 2004-08-13 17:15:24 UTC

--- xc/programs/Xserver/os/WaitFor.c	2004-03-04 12:48:31.000000000 -0500
+++ xc/programs/Xserver/os/WaitFor.c	2004-08-13 20:04:25.785194763 -0400
@@ -666,14 +666,20 @@
     if (DPMSStandbyTime > 0) {
         DPMSStandbyTimer = TimerSet(DPMSStandbyTimer, 0, DPMSStandbyTime,
                                     DPMSStandbyTimerExpire, NULL);
+    } else if (DPMSStandbyTimer) {
+	TimerCancel(DPMSStandbyTimer);
     }
     if (DPMSSuspendTime > 0) {
         DPMSSuspendTimer = TimerSet(DPMSSuspendTimer, 0, DPMSSuspendTime,
                                     DPMSSuspendTimerExpire, NULL);
+    } else if (DPMSSuspendTimer) {
+	TimerCancel(DPMSSuspendTimer);
     }
     if (DPMSOffTime > 0) {
         DPMSOffTimer = TimerSet(DPMSOffTimer, 0, DPMSOffTime,
                                 DPMSOffTimerExpire, NULL);
+    } else if (DPMSOffTimer) {
+	TimerCancel(DPMSOffTimer);
     }
 }
 #endif