From 272046d0128577032afb1c50fc93cf78c90cab8b Mon Sep 17 00:00:00 2001
From: Sebastien Helleu <flashcode@flashtux.org>
Date: Mon, 26 Mar 2012 15:12:05 +0200
Subject: [PATCH] irc: force the clear of nicklist when joining a channel
 (nicklist was not sync after znc reconnection) (bug #36008)

---
 ChangeLog                      | 2 ++
 src/plugins/irc/irc-protocol.c | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f8f78d0e4..24ac41d81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@ Version 0.3.8 (under dev!)
   given to plugin API functions (warning displayed if debug for plugin is >= 1)
 * api: add list "gui_buffer_last_displayed" in hdata "buffer"
 * guile: add missing function "hook_process_hashtable" in API
+* irc: force the clear of nicklist when joining a channel (nicklist was not sync
+  after znc reconnection) (bug #36008)
 * irc: allow more than one nick in command /invite
 * irc: do not send command "MODE #channel" on manual /names (do it only when
   names are received on join of channel) (bug #35930)
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index 99d5871fb..f572b5b78 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -557,6 +557,14 @@ IRC_PROTOCOL_CALLBACK(join)
         }
     }
 
+    /*
+     * local join? clear nicklist to be sure it is empty (when using znc, after
+     * reconnection to network, we receive a JOIN for channel with existing
+     * nicks in irc plugin, so we need to clear the nicklist now)
+     */
+    if (local_join)
+        irc_nick_free_all (server, ptr_channel);
+
     /* reset some variables if joining new channel */
     if (!ptr_channel->nicks)
     {