Delete modewatchers when unloading modules that use them to keep the server from...

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

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 6bd375f88e96fd12dad3a5b80714c15958b62541..ff7fb6ac446bbee6b70995b3a881f3705ad88773 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -20,15 +20,7 @@
 class Redirect : public ModeHandler
 {
  public:
-       Redirect(Module* Creator) : ModeHandler(Creator, 'L', PARAM_SETONLY, MODETYPE_CHANNEL) { }
-
-       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
-       {
-               if (channel->IsModeSet('L'))
-                       return std::make_pair(true, channel->GetModeParameter('L'));
-               else
-                       return std::make_pair(false, parameter);
-       }
+       Redirect(Module* Creator) : ModeHandler(Creator, "redirect", 'L', PARAM_SETONLY, MODETYPE_CHANNEL) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -104,7 +96,7 @@ class ModuleRedirect : public Module
        {
                if (chan)
                {
-                       if (chan->IsModeSet('L') && chan->modes[CM_LIMIT])
+                       if (chan->IsModeSet('L') && chan->IsModeSet('l'))
                        {
                                if (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str()))
                                {
@@ -130,12 +122,11 @@ class ModuleRedirect : public Module
 
        virtual ~ModuleRedirect()
        {
-               ServerInstance->Modes->DelMode(&re);
        }
 
        virtual Version GetVersion()
        {
-               return Version("Provides channel mode +L (limit redirection)", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides channel mode +L (limit redirection)", VF_COMMON | VF_VENDOR);
        }
 };