summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-06-07 13:04:09 +0200
committerAttila Molnar <attilamolnar@hush.com>2014-06-07 13:04:09 +0200
commit9a8970fd0f33af44515863b28625cc4fae4c73a7 (patch)
tree4159b30369037b475f1bd050f2aa78a3ba2ba864 /src
parent41c5e43ff2e50131778714c1f4ce5d04adb82fa9 (diff)
m_channames Call ValidateChans() from cull() on unload
This ensures that if ValidateChans() removes everyone from a channel the channel is added to the cull list at the right time, that is, before the destruction of objects begin. The core IsChannel() is less strict than us regardless of our configuration (for now) but nevertheless this is the correct behavior.
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_channames.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index 69b501792..be9eda2b9 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -141,10 +141,11 @@ class ModuleChannelNames : public Module
}
}
- ~ModuleChannelNames()
+ CullResult cull() CXX11_OVERRIDE
{
ServerInstance->IsChannel = rememberer;
ValidateChans();
+ return Module::cull();
}
Version GetVersion() CXX11_OVERRIDE