Changeset 69b94c3 for irc_im.c


Ignore:
Timestamp:
2015-07-29T21:49:04Z (5 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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • irc_im.c

    r3ddbd23c r69b94c3  
    836836            (room = set_getstr(&ic->set, "room")) &&
    837837            (acc = account_get(ic->irc->b, acc_s)) &&
    838             acc->ic && acc->prpl->chat_join) {
     838            acc->ic && (acc->ic->flags & OPT_LOGGED_IN) &&
     839            acc->prpl->chat_join) {
    839840                char *nick;
    840841
Note: See TracChangeset for help on using the changeset viewer.