From 24de9fa0c79027094383aa0c247e48a4bc6753d3 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 29 Jul 2015 00:41:24 +0100 Subject: Restore old autojoin logic and a hopefully better fix for the problem jgeboski was trying to solve. #1221 for details. --- irc_im.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'irc_im.c') diff --git a/irc_im.c b/irc_im.c index ae75fad1..2f55be54 100644 --- a/irc_im.c +++ b/irc_im.c @@ -835,7 +835,8 @@ static gboolean bee_irc_channel_chat_join(irc_channel_t *ic) if ((acc_s = set_getstr(&ic->set, "account")) && (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; if (!(nick = set_getstr(&ic->set, "nick"))) { -- cgit v1.2.3