summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLemonBoy <LemonBoy@users.noreply.github.com>2017-01-07 22:00:00 +0100
committerGitHub <noreply@github.com>2017-01-07 22:00:00 +0100
commit7c09b72a26884bcd9711f39e2730ab09e658eec1 (patch)
treed14131198c6772243653090cb3f0897ac9be2844
parent808a11a15078356aad767364ed2e07a9001cb6ec (diff)
parent1831a8e1a710decbbcae524c60cdf6216f19a121 (diff)
downloadirssi-7c09b72a26884bcd9711f39e2730ab09e658eec1.zip
Merge pull request #605 from dequis/fix-early-ison
Don't reset wait_cmd during connection registration (fixes early ISON)
-rw-r--r--src/irc/core/irc-servers.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 3117e345..7cbd05a0 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -527,6 +527,12 @@ void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len)
return;
}
+ /* Don't reset wait_cmd during connection registration
+ * (while sending CAP / SASL related commands) */
+ if (!server->connected) {
+ return;
+ }
+
g_get_current_time(&server->last_cmd);
/* A bit kludgy way to do the flood protection. In ircnet, there