From b2cd9d002b1c75790c221430e0174e63a27a6fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Mon, 31 Jul 2023 08:03:50 +0200 Subject: [PATCH] irc: fix switch to channel manually joined (issue #1982) This happens when server option autojoin_dynamic is on and option irc.look.buffer_switch_autojoin is off. Regression was introduced in version 4.0.0 by commit 1c3b871204072b612ea3793708b508fc4de923be. --- ChangeLog.adoc | 1 + src/plugins/irc/irc-channel.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 7170f2a75..096573aca 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -18,6 +18,7 @@ Bug fixes:: * core: fix input length and crash after delete of line (issue #1989) * irc: fix display of self CTCP message containing bold attribute (issue #1981) * irc: fix memory leak in IRC message parser + * irc: fix switch to channel manually joined when server option autojoin_dynamic is on and option irc.look.buffer_switch_autojoin is off (issue #1982) [[v4.0.2]] == Version 4.0.2 (2023-07-12) diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c index e95c442ea..00464ca6f 100644 --- a/src/plugins/irc/irc-channel.c +++ b/src/plugins/irc/irc-channel.c @@ -462,7 +462,7 @@ irc_channel_create_buffer (struct t_irc_server *server, if (noswitch || (!manual_join && !autojoin_join) || (manual_join && !weechat_config_boolean (irc_config_look_buffer_switch_join)) - || (autojoin_join && !weechat_config_boolean (irc_config_look_buffer_switch_autojoin))) + || (!manual_join && autojoin_join && !weechat_config_boolean (irc_config_look_buffer_switch_autojoin))) { switch_to_channel = 0; }