Improve the handling of config X-lines and filters. (#1583)

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

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 8f28a7e9cbee8825e7952973415e4f56beb01bad..322ee91b8f5878d6f5f57c671251019eb08b7887 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -33,7 +33,7 @@ class CommandSamode : public Command
        CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
        {
                allow_empty_last_param = false;
-               flags_needed = 'o'; syntax = "<target> <modes> {<mode-parameters>}";
+               flags_needed = 'o'; syntax = "<target> (+|-)<modes> [<mode-parameters>]";
                active = false;
        }
 
@@ -124,6 +124,9 @@ class ModuleSaMode : public Module
 
        void Prioritize() CXX11_OVERRIDE
        {
+               Module* disable = ServerInstance->Modules->Find("m_disable.so");
+               ServerInstance->Modules->SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disable);
+
                Module *override = ServerInstance->Modules->Find("m_override.so");
                ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override);
        }