summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2014-05-24 08:00:19 +0200
committerSébastien Helleu <flashcode@flashtux.org>2014-05-24 08:00:19 +0200
commit3092c09bc96438afb005c6ce11b07309a945ebc7 (patch)
tree3e77f65671126e44b44fbc46eb3003a48e45313d
parent00179e6244e9fc34437ca12a5c8899fd35352d95 (diff)
downloadweechat-3092c09bc96438afb005c6ce11b07309a945ebc7.zip
relay: remove warning on /reload of relay.conf when ports are defined
-rw-r--r--ChangeLog.asciidoc1
-rw-r--r--src/plugins/relay/relay-config.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index 24ab246be..c70dda39c 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -138,6 +138,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* lua: fix interpreter used after unload of a script
* perl: fix context used after unload of a script
* python: fix interpreter used after unload of a script
+* relay: remove warning on /reload of relay.conf when ports are defined
* relay: fix client disconnection on empty websocket frames received (PONG)
* relay: add support of Internet Explorer websocket (closes #73)
* relay: add messages "_buffer_cleared", "_buffer_hidden" and
diff --git a/src/plugins/relay/relay-config.c b/src/plugins/relay/relay-config.c
index 0ca6c4fa0..67c5cfaa0 100644
--- a/src/plugins/relay/relay-config.c
+++ b/src/plugins/relay/relay-config.c
@@ -462,7 +462,10 @@ relay_config_reload (void *data, struct t_config_file *config_file)
/* make C compiler happy */
(void) data;
- return weechat_config_reload (config_file);
+ weechat_config_section_free_options (relay_config_section_port);
+ relay_server_free_all ();
+
+ return weechat_config_reload (config_file);
}
/*