Fix GetPrefixChar returning empty if a non-prefix mode was used

[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 58419934507721c88b1dfe532cc9a32f63b30225..2a185680d35d9d9e6eeab378712b4af004b61587 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -34,7 +34,7 @@ class CommandSamode : public Command
                if (ServerInstance->Modes->GetLastParse().length())
                        ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick) + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
                this->active = false;
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 
@@ -46,19 +46,19 @@ class ModuleSaMode : public Module
                : Module(Me), cmd(Me, this)
        {
                ServerInstance->AddCommand(&cmd);
-               ServerInstance->Modules->Attach(I_OnAccessCheck, this);
+               ServerInstance->Modules->Attach(I_OnPreMode, this);
        }
 
-       virtual ~ModuleSaMode()
+       ~ModuleSaMode()
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
                return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 
-       virtual ModResult OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
+       ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
        {
                if (cmd.active)
                        return MOD_RES_ALLOW;
@@ -68,7 +68,7 @@ class ModuleSaMode : public Module
        void Prioritize()
        {
                Module *override = ServerInstance->Modules->Find("m_override.so");
-               ServerInstance->Modules->SetPriority(this, I_OnAccessCheck, PRIORITY_BEFORE, &override);
+               ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, &override);
        }
 };