summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/channels.c3
-rw-r--r--src/core/chatnets.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/channels.c b/src/core/channels.c
index 296b1a90..9a92b896 100644
--- a/src/core/channels.c
+++ b/src/core/channels.c
@@ -237,8 +237,7 @@ void channel_send_autocommands(CHANNEL_REC *channel)
g_return_if_fail(IS_CHANNEL(channel));
- if (channel->session_rejoin ||
- channel->server->connrec->no_autojoin_channels)
+ if (channel->session_rejoin)
return;
rec = channel_setup_find(channel->name, channel->server->connrec->chatnet);
diff --git a/src/core/chatnets.c b/src/core/chatnets.c
index f7b0ec62..9e43f859 100644
--- a/src/core/chatnets.c
+++ b/src/core/chatnets.c
@@ -118,7 +118,8 @@ static void sig_connected(SERVER_REC *server)
g_return_if_fail(IS_SERVER(server));
- if (server->connrec->chatnet == NULL || server->session_reconnect)
+ if (server->connrec->chatnet == NULL || server->session_reconnect ||
+ server->connrec->no_autojoin_channels)
return;
rec = chatnet_find(server->connrec->chatnet);