summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2015-06-15 20:41:49 +0200
committerSébastien Helleu <flashcode@flashtux.org>2015-06-15 20:41:49 +0200
commit5bac79c4f1d37b5383fbf38c27615bf0402b1ca2 (patch)
treee76e300bd5c7c9014e0f99140db58b4fa781c53d /src
parent9e0fa27525259fa9272db90846d601aed17fb648 (diff)
downloadweechat-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.
Diffstat (limited to 'src')
-rw-r--r--src/plugins/irc/irc-server.c5
1 files changed, 4 insertions, 1 deletions
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;