aboutsummaryrefslogtreecommitdiffstats
path: root/irc_im.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2015-07-29 00:41:24 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2015-07-29 00:41:24 +0100
commit24de9fa0c79027094383aa0c247e48a4bc6753d3 (patch)
tree801ece5671a739ecc63719ce6c69c61f6e6e65bc /irc_im.c
parent77ed9b724d1bff2a409642795ae81f974b8c312f (diff)
Restore old autojoin logic and a hopefully better fix for the problem
jgeboski was trying to solve. #1221 for details.
Diffstat (limited to 'irc_im.c')
-rw-r--r--irc_im.c3
1 files changed, 2 insertions, 1 deletions
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"))) {