irc: fix title of private buffers wrongly set to own address when capability echo...

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 1b8ace2a6d0931913b907e4854d0661ecba3c7a3..8eef6528e89e41dd06da3579396a5154d5ec5cf6 100644 (file)
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -37,6 +37,7 @@ Bug fixes::
 
   * core: fix integer overflow when setting integer option with `++N` or `--N`
   * core: fix increment/decrement of options weechat.notify.*
+  * irc: fix title of private buffers wrongly set to own address when capability echo-message is enabled (issue #2016)
   * irc: add missing tags on multiline messages (issue #1987)
   * irc: fix redirection of command `/list` when the reply doesn't start with message 321 (start of /list)
   * irc: fix wrong time displayed for CTCP messages received from self nick (issue #2000)

diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index ee2491f5d14e487ca704219eecd43ffea2f4cd97..60e90595135070f34c7e59f09b59f198388a0eb9 100644 (file)
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -3253,8 +3253,6 @@ IRC_PROTOCOL_CALLBACK(privmsg)
                                          IRC_CHANNEL_TYPING_STATE_OFF);
         }
 
-        irc_channel_set_topic (ptr_channel, address);
-
         if (nick_is_me)
         {
             str_color = irc_color_for_tags (
@@ -3263,6 +3261,7 @@ IRC_PROTOCOL_CALLBACK(privmsg)
         }
         else
         {
+            irc_channel_set_topic (ptr_channel, address);
             if (weechat_config_boolean (irc_config_look_color_pv_nick_like_channel))
             {
                 color = irc_nick_find_color_name (nick);