diff options
author | TingPing <tngpng@gmail.com> | 2013-05-17 05:28:45 -0300 |
---|---|---|
committer | TingPing <tngpng@gmail.com> | 2013-05-17 05:28:45 -0300 |
commit | c83ca8f85abf5b841a77386cd4ebcd84c1deca2a (patch) | |
tree | 9b1976f6de47c5c5e1e375a4af4604cf6f87500a /src/common/inbound.c | |
parent | ef58a267b0cc5c97319a6f66dd15d99393390e2c (diff) |
Respect irc_join_delay if connect command set
Diffstat (limited to 'src/common/inbound.c')
-rw-r--r-- | src/common/inbound.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/inbound.c b/src/common/inbound.c index 6c85feec..b35e3f52 100644 --- a/src/common/inbound.c +++ b/src/common/inbound.c @@ -1425,8 +1425,10 @@ inbound_login_end (session *sess, char *text) } } - /* send JOIN now or wait? */ - if (serv->network && ((ircnet *)serv->network)->pass && prefs.hex_irc_join_delay && inbound_nickserv_login (serv)) + /* wait for join if command or nickserv set */ + if (serv->network && prefs.hex_irc_join_delay + && ((((ircnet *)serv->network)->pass && inbound_nickserv_login (serv)) + || ((ircnet *)serv->network)->commandlist)) { serv->joindelay_tag = fe_timeout_add (prefs.hex_irc_join_delay * 1000, check_autojoin_channels, serv); } |