Changeset cdca30b

Timestamp:

2006-05-27T15:33:58Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4ff0966

Parents:

68b518d6

Message:

Making sure that event handlers don't get called anymore after a call to
b_main_quit().

File:

• protocols/events_libevent.c (modified) (3 diffs)

protocols/events_libevent.c

@@ -39 +39 @@
 static guint id_next;
 static GHashTable *id_hash;
+static int quitting = 0;
 
 /* Since libevent doesn't handle two event handlers for one fd-condition
@@ -75 +76 @@
         struct timeval tv;
         
+        /* libevent sometimes generates events before really quitting,
+           we want to stop them. */
+        quitting = 1;
+        
         memset( &tv, 0, sizeof( struct timeval ) );
         event_loopexit( &tv );
@@ -98 +103 @@
            (which free()s b_ev, we have to remember the ID here. */
         id = b_ev->id;
+        
+        if( quitting )
+        {
+                b_event_remove( id );
+                return;
+        }
         
         if( !b_ev->function( b_ev->data, fd, cond ) )