diff options
| author | Timo Sirainen <cras@irssi.org> | 2002-12-01 16:28:12 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2002-12-01 16:28:12 +0000 |
| commit | ad1136267f870cfb9141f9e60e93c7ffe34240a3 (patch) | |
| tree | fcbed1ead7dee48eef3ec33ea4f8e414dfd17bec | |
| parent | b25d6f0e04033a964cfc8d20b1f2946b0458a357 (diff) | |
| download | irssi-ad1136267f870cfb9141f9e60e93c7ffe34240a3.zip | |
no, /connect -! shouldn't send the /ircnet -autosendcmd, channel's botcmd
should still be sent..
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3036 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | src/core/channels.c | 3 | ||||
| -rw-r--r-- | src/core/chatnets.c | 3 |
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); |