Changeset eb4ad8d for irc_channel.c

Timestamp:

2015-01-17T20:13:19Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e26aa72

Parents:

1065dd4 (diff), 664bac3 (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:

Merging random other fixes/cleanups.

File:

• irc_channel.c (modified) (1 diff)

irc_channel.c

@@ -432 +432 @@
                         char *acc_s;
                         
-                        if( !aj && !( ic->flags & IRC_CHANNEL_JOINED ) )
+                        if( !aj || ( ic->flags & IRC_CHANNEL_JOINED ) )
                                 /* Only continue if this one's marked as auto_join
                                    or if we're in it already. (Possible if the