commit fc635fa827ad7bef0bb163ea6c2521f1ad1da8c9
author Trent Waddington <trent.waddington@gmail.com> Thu Aug 30 19:05:50 2007 +1000
committer Alexandre Julliard <julliard@winehq.org> Thu Aug 30 19:08:16 2007 +0200
tree baf23cdc368c2df4838e4a1c392728b8ccc0014a
parent d4337f2b5e26b341233b89f00b3e8791327a2b76

server: Handle existing timer replacement when no window handle specified.

server/queue.c

diff --git a/server/queue.c b/server/queue.c
index 1e8de22..cdab2a8 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -1927,13 +1927,22 @@
     else
     {
         queue = get_current_queue();
-        /* find a free id for it */
-        do
+        /* look for a timer with this id */
+        if (id && (timer = find_timer( queue, NULL, req->msg, id )))
         {
-            id = queue->next_timer_id;
-            if (++queue->next_timer_id >= 0x10000) queue->next_timer_id = 1;
+            /* free and reuse id */
+            free_timer( queue, timer );
         }
-        while (find_timer( queue, 0, req->msg, id ));
+        else
+        {
+            /* find a free id for it */
+            do
+            {
+                id = queue->next_timer_id;
+                if (++queue->next_timer_id >= 0x10000) queue->next_timer_id = 1;
+            }
+            while (find_timer( queue, 0, req->msg, id ));
+        }
     }
 
     if ((timer = set_timer( queue, req->rate )))