X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fmodules.c;h=4b095bc5c52844f204e2dd05101572248c4632bf;hb=43e29020db661002e0fdff3b42abba32c43393dd;hp=41fb51438863a304b362a1acdf2e0e613d86941e;hpb=85eb17b306404571aa39596946c87ad9bb1d9d13;p=tpg%2Facess2.git

diff --git a/Kernel/modules.c b/Kernel/modules.c
index 41fb5143..4b095bc5 100644
--- a/Kernel/modules.c
+++ b/Kernel/modules.c
@@ -88,7 +88,8 @@ int Module_int_Initialise(tModule *Module, char *ArgString)
 				break;
 		}
 		if( mod ) {
-			Log_Warning("Module", "Circular dependency detected");
+			Log_Warning("Module", "Circular dependency detected (%s and %s)",
+				mod->Name, Module->Name);
 			LEAVE_RET('i', -1);
 		}
 		
@@ -99,7 +100,8 @@ int Module_int_Initialise(tModule *Module, char *ArgString)
 				break;
 		}
 		if( i == giNumBuiltinModules ) {
-			Log_Warning("Module", "Dependency '%s' for module '%s' failed");
+			Log_Warning("Module", "Dependency '%s' for module '%s' failed",
+				deps[j], Module->Name);
 			return -1;
 		}
 		
@@ -132,6 +134,9 @@ int Module_int_Initialise(tModule *Module, char *ArgString)
 	
 	if(args)	free(args);
 	
+	// Remove from loading list
+	gLoadingModules = gLoadingModules->Next;
+	
 	if( ret != MODULE_ERR_OK ) {
 		switch(ret)
 		{
@@ -153,9 +158,6 @@ int Module_int_Initialise(tModule *Module, char *ArgString)
 	}
 	LOG("ret = %i", ret);
 	
-	// Remove from loading list
-	gLoadingModules = gLoadingModules->Next;
-	
 	// Add to loaded list
 	LOCK( &glModuleSpinlock );
 	Module->Next = gLoadedModules;