Merge insp20

[user/henk/code/inspircd.git] / src / modules / m_silence.cpp

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index fe741862131f4d90c75e853e63975917c6966023..3a213c6e7c2e0b2c43d8526a75f3137d04736767 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -85,7 +85,7 @@ class CommandSVSSilence : public Command
 
                if (IS_LOCAL(u))
                {
-                       ServerInstance->Parser->CallHandler("SILENCE", std::vector<std::string>(++parameters.begin(), parameters.end()), u);
+                       ServerInstance->Parser->CallHandler("SILENCE", std::vector<std::string>(parameters.begin() + 1, parameters.end()), u);
                }
 
                return CMD_SUCCESS;
@@ -301,7 +301,7 @@ class ModuleSilence : public Module
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               maxsilence = ServerInstance->Config->ConfValue("showwhois")->getInt("maxentries", 32);
+               maxsilence = ServerInstance->Config->ConfValue("silence")->getInt("maxentries", 32);
                if (!maxsilence)
                        maxsilence = 32;
        }