irc: remove SASL timeout message displayed by error after successful SASL authenticat...

The SASL timer is removed immediately when the SASL authentication is
successful or has failed.

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 310b5c0dbca1416fd6713279f8119719696211d9..fa51080baccc672982d1b6ad987e5d0c9e46af41 100644 (file)
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -35,6 +35,7 @@ Bug fixes::
 
   * core: set "notify_level" to 3 if there is a highlight in the line (issue #1529)
   * core: do not add line with highlight and tag "notify_none" to hotlist (issue #1529)
+  * irc: remove SASL timeout message displayed by error after successful SASL authentication (issue #1515)
   * irc: send all channels in a single JOIN command when reconnecting to the server (issue #1551)
   * script: do not automatically download list of scripts on startup if the file is too old (issue #1548)
   * spell: properly skip WeeChat and IRC color codes when checking words in input (issue #1547)

diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index aab804e6df3149ff49096962ae7cf4bcb3cac64c..8a6b3ac0bcb11204306f0f1c368d46b704a2731a 100644 (file)
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -6372,6 +6372,12 @@ IRC_PROTOCOL_CALLBACK(901)
 
 IRC_PROTOCOL_CALLBACK(sasl_end_ok)
 {
+    if (server->hook_timer_sasl)
+    {
+        weechat_unhook (server->hook_timer_sasl);
+        server->hook_timer_sasl = NULL;
+    }
+
     irc_protocol_cb_numeric (server,
                              date, nick, address, host, command,
                              ignored, argc, argv, argv_eol);
@@ -6393,6 +6399,12 @@ IRC_PROTOCOL_CALLBACK(sasl_end_fail)
 {
     int sasl_fail;
 
+    if (server->hook_timer_sasl)
+    {
+        weechat_unhook (server->hook_timer_sasl);
+        server->hook_timer_sasl = NULL;
+    }
+
     irc_protocol_cb_numeric (server,
                              date, nick, address, host, command,
                              ignored, argc, argv, argv_eol);