commit c3624439c888c17180b0c60c7db478241fcc51b3
author Alexandre Julliard <julliard@winehq.org> Thu Aug 09 17:16:26 2007 +0200
committer Alexandre Julliard <julliard@winehq.org> Thu Aug 09 17:16:26 2007 +0200
tree ae7703314f1a981b832a4d66fff1446e5f0764bd
parent 39d615eeed7f63b63beca600871f1666bd318484

server: Fixed handling of a relative start time for a timer.

server/timer.c

diff --git a/server/timer.c b/server/timer.c
index ffa4b03..05c0e81 100644
--- a/server/timer.c
+++ b/server/timer.c
@@ -164,8 +164,7 @@
         period = 0;  /* period doesn't make any sense for a manual timer */
         timer->signaled = 0;
     }
-    if (expire > 0 && expire < current_time) expire = current_time;
-    timer->when     = expire;
+    timer->when     = (expire <= 0) ? current_time - expire : max( expire, current_time );
     timer->period   = period;
     timer->callback = callback;
     timer->arg      = arg;