diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2015-01-17 20:13:19 +0000 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2015-01-17 20:13:19 +0000 |
commit | eb4ad8d31f7ed4210f24beb8753ecce594b0beef (patch) | |
tree | f7f9cf04738522a79f874e0e8ce9b915014861fc /irc_channel.c | |
parent | 1065dd4f38c81c83934ba51526471072837700ae (diff) | |
parent | 664bac38fcdf6889d3ceb29b73a0c3a4e27820ce (diff) |
Merging random other fixes/cleanups.
Diffstat (limited to 'irc_channel.c')
-rw-r--r-- | irc_channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/irc_channel.c b/irc_channel.c index 0a6e11d2..f3ec296c 100644 --- a/irc_channel.c +++ b/irc_channel.c @@ -431,7 +431,7 @@ void irc_channel_auto_joins( irc_t *irc, account_t *acc ) can only auto-join them if their account is online. */ 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 client auto-rejoined it before identyfing.) */ |