Changeset cc20520

Timestamp:

2010-12-02T12:14:09Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b41d5d2

Parents:

b11b781

Message:

Clean up pastebuf_timer when cleaning up channels, and properly clean up
channel-chatroom reference when leaving a chatroom. This fixes two very
similar crash bugs when leaving a chatroom within the paste_buffer_delay
period.

Files:

• irc_channel.c (modified) (1 diff)
• irc_im.c (modified) (2 diffs)

irc_channel.c

@@ -142 +142 @@
                         iu->last_channel = irc->default_channel;
         }
+        
+        if( ic->pastebuf_timer ) b_event_remove( ic->pastebuf_timer );
         
         g_free( ic->name );

irc_im.c

@@ -794 +794 @@
         irc_channel_t *ic = data;
         
-        bee_chat_msg( ic->irc->b, ic->data, ic->pastebuf->str, 0 );
+        if( ic->data )
+                bee_chat_msg( ic->irc->b, ic->data, ic->pastebuf->str, 0 );
         
         g_string_free( ic->pastebuf, TRUE );
@@ -840 +841 @@
         if( c && c->ic->acc->prpl->chat_leave )
                 c->ic->acc->prpl->chat_leave( c );
+        
+        ic->data = NULL;
         
         return TRUE;