summaryrefslogtreecommitdiff
path: root/src/core/chatnets.c
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@irssi.org>2011-11-21 21:27:58 +0000
committerahf <ahf@dbcabf3a-b0e7-0310-adc4-f8d773084564>2011-11-21 21:27:58 +0000
commit796134ffbd57eb47922bfa44a9823fae404ab522 (patch)
tree4d0d3175941b970e40f7a61e1fe46320885baf7d /src/core/chatnets.c
parent518b822db451a863b9496e985b10b88c50339582 (diff)
downloadirssi-796134ffbd57eb47922bfa44a9823fae404ab522.zip
Add -noautosendcmd to /SERVER and /CONNECT.
Passing this option will force Irssi to not execute the content of the autosendcmd chatnet-setting upon connect. Fixes: #738 git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5209 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core/chatnets.c')
-rw-r--r--src/core/chatnets.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/chatnets.c b/src/core/chatnets.c
index c307afda..376fab58 100644
--- a/src/core/chatnets.c
+++ b/src/core/chatnets.c
@@ -118,12 +118,11 @@ static void sig_connected(SERVER_REC *server)
g_return_if_fail(IS_SERVER(server));
- if (server->connrec->chatnet == NULL || server->session_reconnect ||
- server->connrec->no_autojoin_channels)
+ if (server->connrec->chatnet == NULL || server->session_reconnect)
return;
rec = chatnet_find(server->connrec->chatnet);
- if (rec != NULL && rec->autosendcmd)
+ if (!server->connrec->no_autosendcmd && rec != NULL && rec->autosendcmd)
eval_special_string(rec->autosendcmd, "", server, NULL);
}