summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.adoc1
-rw-r--r--src/plugins/irc/irc-command.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index bfd6d8664..79ce39296 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -44,6 +44,7 @@ Bug fixes::
* buflist: remove recursive evaluation of extra variables (issue #1060)
* guile: return integer (0/1) instead of boolean in API functions
* guile: fix return value of static strings in API functions
+ * irc: do not clear nicklist when joining an already joined channel if the option irc.look.buffer_open_before_join is on (issue #1081)
* irc: fix CTCP PING reply when the option irc.ctcp.ping is set to non-empty value
* lua: fix boolean return value (as integer) in API functions
* relay: fix parsing of CAP command without arguments in irc protocol, send ACK only if all capabilities received are OK and NAK otherwise (issue #1040)
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index c43a7a362..b8c43fef8 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -2544,7 +2544,8 @@ irc_command_join_server (struct t_irc_server *server, const char *arguments,
}
}
if (manual_join
- && weechat_config_boolean (irc_config_look_buffer_open_before_join))
+ && weechat_config_boolean (irc_config_look_buffer_open_before_join)
+ && !irc_channel_search (server, pos_channel))
{
/*
* open the channel buffer immediately (do not wait for the