forked from PsychoticNinja/irssi
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
This commit is contained in:
parent
b25d6f0e04
commit
ad1136267f
@ -237,8 +237,7 @@ void channel_send_autocommands(CHANNEL_REC *channel)
|
|||||||
|
|
||||||
g_return_if_fail(IS_CHANNEL(channel));
|
g_return_if_fail(IS_CHANNEL(channel));
|
||||||
|
|
||||||
if (channel->session_rejoin ||
|
if (channel->session_rejoin)
|
||||||
channel->server->connrec->no_autojoin_channels)
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
rec = channel_setup_find(channel->name, channel->server->connrec->chatnet);
|
rec = channel_setup_find(channel->name, channel->server->connrec->chatnet);
|
||||||
|
@ -118,7 +118,8 @@ static void sig_connected(SERVER_REC *server)
|
|||||||
|
|
||||||
g_return_if_fail(IS_SERVER(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;
|
return;
|
||||||
|
|
||||||
rec = chatnet_find(server->connrec->chatnet);
|
rec = chatnet_find(server->connrec->chatnet);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user