From 1234d6c8f73fde30a7113b5e526b8786512dd233 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Fri, 9 Dec 2011 15:55:52 +0100 Subject: [PATCH] irc: reset read marker of current buffer on manual /join --- ChangeLog | 3 ++- src/plugins/irc/irc-channel.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a9041df9..d08c1d58f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu -v0.3.7-dev, 2011-12-07 +v0.3.7-dev, 2011-12-09 Version 0.3.7 (under dev!) @@ -35,6 +35,7 @@ Version 0.3.7 (under dev!) reconnection problem (bug #34626) * api: add new functions strcasecmp_range, strncasecmp_range, hdata_char and nicklist_get_next_item +* irc: reset read marker of current buffer on manual /join * irc: fix crash when signon time in message 317 (whois, idle) is invalid (too large) (bug #34905) * irc: do not delete servers added in irc.conf on /reload (bug #34872) diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c index 9348e7ee2..8bd4c59f4 100644 --- a/src/plugins/irc/irc-channel.c +++ b/src/plugins/irc/irc-channel.c @@ -314,7 +314,7 @@ irc_channel_new (struct t_irc_server *server, int channel_type, if (switch_to_channel) { weechat_buffer_set (new_buffer, "display", - (auto_switch) ? "auto" : "1"); + (auto_switch && !manual_join) ? "auto" : "1"); } }