Destroy Memberships of a quitting user in QuitUser() instead of in cull()

[user/henk/code/inspircd.git] / src / base.cpp

diff --git a/src/base.cpp b/src/base.cpp
index db8d9f3cfe3dfd836314d41a6f1ca7677fc9090b..cf28f8e7d34375359f1306d37ebde1c79af7415f 100644 (file)
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -186,13 +186,18 @@ Extensible::Extensible()
 }
 
 CullResult Extensible::cull()
+{
+       FreeAllExtItems();
+       return classbase::cull();
+}
+
+void Extensible::FreeAllExtItems()
 {
        for(ExtensibleStore::iterator i = extensions.begin(); i != extensions.end(); ++i)
        {
                i->first->free(i->second);
        }
        extensions.clear();
-       return classbase::cull();
 }
 
 Extensible::~Extensible()
@@ -311,4 +316,3 @@ ModuleException::ModuleException(const std::string &message, Module* who)
        : CoreException(message, who ? who->ModuleSourceFile : "A Module")
 {
 }
-