Changeset 69b94c3

Timestamp:

2015-07-29T21:49:04Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

8e5751e

Parents:

3ddbd23c (diff), 24de9fa (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 remote-tracking branch 'origin/master' into parson

This includes the auto_join fix.

Files:

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

irc_channel.c

@@ -445 +445 @@
                         char *acc_s;
 
-                        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.) */
+                        if (!aj && !(ic->flags & IRC_CHANNEL_JOINED)) {
+                                /* Only proceed if this one's marked as auto_join
+                                   or if we're in it already. (Very likely the IRC
+                                   client auto-(re)joining at reconnect time.) */
                                 continue;
                         } else if (!(acc_s = set_getstr(&ic->set, "account"))) {

irc_im.c

@@ -836 +836 @@
             (room = set_getstr(&ic->set, "room")) &&
             (acc = account_get(ic->irc->b, acc_s)) &&
-            acc->ic && acc->prpl->chat_join) {
+            acc->ic && (acc->ic->flags & OPT_LOGGED_IN) &&
+            acc->prpl->chat_join) {
                 char *nick;