Merged Irssi SVN (upcoming irssi 0.8.11).

[silc.git] / apps / irssi / src / core / chatnets.c

diff --git a/apps/irssi/src/core/chatnets.c b/apps/irssi/src/core/chatnets.c
index f7b0ec627ce2d06dbb77fbf014b6f445b6cce179..9e43f859a81ec01335017d8b3f6644b1c3ff8452 100644 (file)
--- a/apps/irssi/src/core/chatnets.c
+++ b/apps/irssi/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);