X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=c131f4dae25ae440eef1414524c266ea1f4e2c25;hb=393cc8f9d65aefd92628115edae341562ea440e7;hp=db8d9f3cfe3dfd836314d41a6f1ca7677fc9090b;hpb=b36ce84c7da93f680fc397bcb4c877abe063eaaa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/base.cpp b/src/base.cpp
index db8d9f3cf..c131f4dae 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -27,13 +27,13 @@
 
 classbase::classbase()
 {
-	if (ServerInstance && ServerInstance->Logs)
+	if (ServerInstance)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::+ @%p", (void*)this);
 }
 
 CullResult classbase::cull()
 {
-	if (ServerInstance && ServerInstance->Logs)
+	if (ServerInstance)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::-%s @%p",
 			typeid(*this).name(), (void*)this);
 	return CullResult();
@@ -41,7 +41,7 @@ CullResult classbase::cull()
 
 classbase::~classbase()
 {
-	if (ServerInstance && ServerInstance->Logs)
+	if (ServerInstance)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::~ @%p", (void*)this);
 }
 
@@ -73,14 +73,14 @@ refcountbase::refcountbase() : refcount(0)
 
 refcountbase::~refcountbase()
 {
-	if (refcount && ServerInstance && ServerInstance->Logs)
+	if (refcount && ServerInstance)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "refcountbase::~ @%p with refcount %d",
 			(void*)this, refcount);
 }
 
 usecountbase::~usecountbase()
 {
-	if (usecount && ServerInstance && ServerInstance->Logs)
+	if (usecount && ServerInstance)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "usecountbase::~ @%p with refcount %d",
 			(void*)this, usecount);
 }
@@ -174,30 +174,30 @@ void Extensible::doUnhookExtensions(const std::vector<reference<ExtensionItem> >
 	}
 }
 
-static struct DummyExtensionItem : LocalExtItem
-{
-	DummyExtensionItem() : LocalExtItem("", NULL) {}
-	void free(void*) {}
-} dummy;
-
 Extensible::Extensible()
+	: culled(false)
 {
-	extensions[&dummy] = NULL;
 }
 
 CullResult Extensible::cull()
+{
+	FreeAllExtItems();
+	culled = true;
+	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()
 {
-	if (!extensions.empty() && ServerInstance && ServerInstance->Logs)
+	if ((!extensions.empty() || !culled) && ServerInstance)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Extensible destructor called without cull @%p", (void*)this);
 }
 
@@ -311,4 +311,3 @@ ModuleException::ModuleException(const std::string &message, Module* who)
 	: CoreException(message, who ? who->ModuleSourceFile : "A Module")
 {
 }
-