commit f5c1381e065bfab1903eebd7596f670b82c28509
author Mike McCormack <mike@codeweavers.com> Tue Mar 28 17:58:07 2006 +0900
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 28 12:21:54 2006 +0200
tree ccddc55380587928bfd2686a20a59e89d6aa3dcf
parent c44410d1e358b9690cdabd9e55f076ffc926d180

server: Fix a race condition in the delivery of change notifications.

server/change.c

diff --git a/server/change.c b/server/change.c
index 4349d7e..eec1241 100644
--- a/server/change.c
+++ b/server/change.c
@@ -591,11 +591,6 @@
 
     if (!list_empty( &dir->change_q ))
         async_terminate_head( &dir->change_q, STATUS_ALERTED );
-    else
-    {
-        dir->signaled++;
-        dir_signal_changed( dir );
-    }
 }
 
 static unsigned int filter_from_event( struct inotify_event *ie )
@@ -1133,6 +1128,11 @@
     if (event)
         reset_event( event );
 
+    /* if there's already a change in the queue, send it */
+    if (!list_empty( &dir->change_q ) &&
+        !list_empty( &dir->change_records ))
+        async_terminate_head( &dir->change_q, STATUS_ALERTED );
+
     /* setup the real notification */
     if (!inotify_adjust_changes( dir ))
         dnotify_adjust_changes( dir );