diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2015-06-15 20:41:49 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2015-06-15 20:41:49 +0200 |
| commit | 5bac79c4f1d37b5383fbf38c27615bf0402b1ca2 (patch) | |
| tree | e76e300bd5c7c9014e0f99140db58b4fa781c53d | |
| parent | 9e0fa27525259fa9272db90846d601aed17fb648 (diff) | |
| download | weechat-5bac79c4f1d37b5383fbf38c27615bf0402b1ca2.zip | |
irc: do not open auto-joined channels buffers when option "-nojoin" is used in command /connect
Even if the option irc.look.buffer_open_before_autojoin is on.
| -rw-r--r-- | ChangeLog.asciidoc | 3 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 2c4ecc8de..84e60acd4 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -29,6 +29,9 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] weechat.look.buffer_time_format is set to empty string (closes #441) * fifo: fix send error on Cygwin when something is received in the pipe (closes #436) +* irc: do not open auto-joined channels buffers when option "-nojoin" is used + in command /connect (even if the option irc.look.buffer_open_before_autojoin + is on) * irc: fix errors displayed on WHOX messages received (closes #376) * lua: add detection of Lua 5.3 * ruby: add detection of Ruby 2.2 diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 36ee7df1d..346680c23 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -4469,8 +4469,11 @@ irc_server_connect (struct t_irc_server *server) irc_server_close_connection (server); /* open auto-joined channels now (if needed) */ - if (weechat_config_boolean (irc_config_look_buffer_open_before_autojoin)) + if (weechat_config_boolean (irc_config_look_buffer_open_before_autojoin) + && !server->disable_autojoin) + { irc_server_autojoin_create_buffers (server); + } /* init SSL if asked and connect */ server->ssl_connected = 0; |