Run DelMode and DelModeWatcher in RemoveModule

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

diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index 35d7f51794f1133ffd495194f1f11cfe3d2bed27..b6dc7af2cdd8dfd369feb1d1fd116094d200f841 100644 (file)
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -20,7 +20,7 @@
 class PrivacyMode : public ModeHandler
 {
  public:
-       PrivacyMode(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'c', PARAM_NONE, MODETYPE_USER) { }
+       PrivacyMode(Module* Creator) : ModeHandler(Creator, 'c', PARAM_NONE, MODETYPE_USER) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -49,7 +49,7 @@ class ModulePrivacyMode : public Module
 {
        PrivacyMode pm;
  public:
-       ModulePrivacyMode(InspIRCd* Me) : Module(Me), pm(Me, this)
+       ModulePrivacyMode() : pm(this)
        {
                if (!ServerInstance->Modes->AddMode(&pm))
                        throw ModuleException("Could not add new modes!");
@@ -60,7 +60,6 @@ class ModulePrivacyMode : public Module
 
        virtual ~ModulePrivacyMode()
        {
-               ServerInstance->Modes->DelMode(&pm);
        }
 
        virtual Version GetVersion()