Run DelMode and DelModeWatcher in RemoveModule

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

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 3e2e18a8e73abf6f9b14d4bf2e0960cc1afead01..7fdc12f882ebb69e48725a7e874ea58f85fbc8a7 100644 (file)
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -135,7 +135,7 @@ class PermChannel : public ModeHandler
                {
                        if (channel->IsModeSet('P'))
                        {
-                               if (channel->GetUserCounter() == 0 && !IS_FAKE(source))
+                               if (channel->GetUserCounter() == 0 && !IS_SERVER(source))
                                {
                                        /*
                                         * ugh, ugh, UGH!
@@ -187,7 +187,6 @@ public:
 
        virtual ~ModulePermanentChannels()
        {
-               ServerInstance->Modes->DelMode(&p);
                /*
                 * DelMode can't remove the +P mode on empty channels, or it will break
                 * merging modes with remote servers. Remove the empty channels now as