diff options
| author | Adam <Adam@anope.org> | 2014-05-28 12:11:45 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2014-05-28 12:22:39 -0400 |
| commit | f97e339314257fa37cfcab0c2289fb6812e32e85 (patch) | |
| tree | a1c9d352a771e0bb7d39d42178a7246d6f2c5434 /modules/commands | |
| parent | f29e1cf383529a1a29f02b0669d973f5ee0b7a66 (diff) | |
| parent | ba46b8e4abd8fef991732d5c52c858a229894a25 (diff) | |
Merge branch '2.0' into 2.1
Conflicts:
.travis.yml
src/config.cpp
src/version.sh
Diffstat (limited to 'modules/commands')
| -rw-r--r-- | modules/commands/ns_set.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/os_mode.cpp | 4 | ||||
| -rw-r--r-- | modules/commands/os_reload.cpp | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/modules/commands/ns_set.cpp b/modules/commands/ns_set.cpp index 984f1d002..e0d0299a3 100644 --- a/modules/commands/ns_set.cpp +++ b/modules/commands/ns_set.cpp @@ -122,7 +122,7 @@ class CommandNSSetPassword : public Command void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) override { - const Anope::string ¶m = params[1]; + const Anope::string ¶m = params[0]; unsigned len = param.length(); if (Anope::ReadOnly) diff --git a/modules/commands/os_mode.cpp b/modules/commands/os_mode.cpp index 4d94759df..9a5d8c41f 100644 --- a/modules/commands/os_mode.cpp +++ b/modules/commands/os_mode.cpp @@ -89,7 +89,9 @@ class CommandOSMode : public Command Anope::string param, param_log; if (cm->type != MODE_REGULAR) { - if (!sep.GetToken(param)) + if (cm->type == MODE_PARAM && !add && anope_dynamic_static_cast<ChannelModeParam *>(cm)->minus_no_arg) + ; + else if (!sep.GetToken(param)) continue; param_log = param; diff --git a/modules/commands/os_reload.cpp b/modules/commands/os_reload.cpp index 647f187b4..b5705d611 100644 --- a/modules/commands/os_reload.cpp +++ b/modules/commands/os_reload.cpp @@ -26,8 +26,11 @@ class CommandOSReload : public Command Log(LOG_ADMIN, source, this); Configuration::Conf *new_config = new Configuration::Conf(); - delete Config; + Configuration::Conf *old = Config; Config = new_config; + Config->Post(old); + delete old; + source.Reply(_("Services' configuration has been reloaded.")); } catch (const ConfigException &ex) |