Fix infinite loop on alias expansion, found by Adam

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

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index c151cb4e449552d6018a26f8e9b7cfb94b7f874a..9d5fe3b623434d831e456cebe20d87491bb21c7a 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -31,7 +31,7 @@ class KickRejoin : public ModeHandler
 {
  public:
        SimpleExtItem<delaylist> ext;
-       KickRejoin(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'J', 1, 0, false, MODETYPE_CHANNEL, false),
+       KickRejoin(Module* Creator) : ModeHandler(Creator, "kicknorejoin", 'J', PARAM_SETONLY, MODETYPE_CHANNEL),
                ext("norejoinusers", Creator) { }
 
        ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
@@ -104,12 +104,12 @@ class ModuleKickNoRejoin : public Module
 
 public:
 
-       ModuleKickNoRejoin(InspIRCd* Me)
-               : Module(Me), kr(Me, this)
+       ModuleKickNoRejoin()
+               : kr(this)
        {
                if (!ServerInstance->Modes->AddMode(&kr))
                        throw ModuleException("Could not add new modes!");
-               Extensible::Register(&kr.ext);
+               ServerInstance->Extensions.Register(&kr.ext);
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
@@ -166,7 +166,6 @@ public:
 
        ~ModuleKickNoRejoin()
        {
-               ServerInstance->Modes->DelMode(&kr);
        }
 
        Version GetVersion()