Commit c3624439 authored by Alexandre Julliard's avatar Alexandre Julliard

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

parent 39d615ee
...@@ -164,8 +164,7 @@ static int set_timer( struct timer *timer, timeout_t expire, unsigned int period ...@@ -164,8 +164,7 @@ static int set_timer( struct timer *timer, timeout_t expire, unsigned int period
period = 0; /* period doesn't make any sense for a manual timer */ period = 0; /* period doesn't make any sense for a manual timer */
timer->signaled = 0; timer->signaled = 0;
} }
if (expire > 0 && expire < current_time) expire = current_time; timer->when = (expire <= 0) ? current_time - expire : max( expire, current_time );
timer->when = expire;
timer->period = period; timer->period = period;
timer->callback = callback; timer->callback = callback;
timer->arg = arg; timer->arg = arg;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment