Changeset 07874be for irc_user.c

Timestamp:

2010-08-14T13:44:35Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e5854a8

Parents:

5848675 (diff), 136c2bb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline stuff.

File:

• irc_user.c (modified) (1 diff)

irc_user.c

@@ -211 +211 @@
         
         for( l = iu->irc->channels; l; l = l->next )
-                send_quit |= irc_channel_del_user( (irc_channel_t*) l->data, iu, IRC_CDU_SILENT, NULL );
+        {
+                irc_channel_t *ic = l->data;
+                send_quit |= irc_channel_del_user( ic, iu, IRC_CDU_SILENT, NULL ) &&
+                             ( ic->flags & IRC_CHANNEL_JOINED );
+        }
         
         if( send_quit )