X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=edcb243e27b93e4243ff50214d7fd44aeff4e122;hb=efb7084f4970b3703be1cef22c5930cc6a49454d;hp=9ca33e2ddb6e3cd5310066cadfb3b1a24345159e;hpb=1442193c79016ea60a8a6e7df66f758040b77c76;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 9ca33e2dd..edcb243e2 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -33,11 +33,9 @@
 #endif
 
 static intrusive_list<dynamic_reference_base>* dynrefs = NULL;
-static bool dynref_init_complete = false;
 
 void dynamic_reference_base::reset_all()
 {
-	dynref_init_complete = true;
 	if (!dynrefs)
 		return;
 	for (intrusive_list<dynamic_reference_base>::iterator i = dynrefs->begin(); i != dynrefs->end(); ++i)
@@ -674,7 +672,9 @@ dynamic_reference_base::dynamic_reference_base(Module* Creator, const std::strin
 	if (!dynrefs)
 		dynrefs = new intrusive_list<dynamic_reference_base>;
 	dynrefs->push_front(this);
-	if (dynref_init_complete)
+
+	// Resolve unless there is no ModuleManager (part of class InspIRCd)
+	if (ServerInstance)
 		resolve();
 }