X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodmanager_static.cpp;h=321bf520dd7833ff7f5448a65e893ed2b94792c3;hb=03a623a284b6c9f2f11f549c55333c45c4d91eab;hp=c82ee3f7ae3e901f38e7c01249d695741bc7f666;hpb=e0cb6bd46fb1d804ad6adea5688c844f7e1a0f6f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index c82ee3f7a..321bf520d 100644
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -58,7 +58,7 @@ class AllModule : public Module
 			{
 				Command* c = (*i)(this);
 				cmds.push_back(c);
-				ServerInstance->AddCommand(c);
+				ServerInstance->Modules->AddService(*c);
 			}
 		}
 		catch (...)
@@ -102,6 +102,7 @@ bool ModuleManager::Load(const std::string& name, bool defer)
 		}
 		else
 		{
+			AttachAll(mod);
 			mod->init();
 		}
 	}
@@ -112,7 +113,7 @@ bool ModuleManager::Load(const std::string& name, bool defer)
 		ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Unable to load " + name + ": " + modexcept.GetReason());
 		return false;
 	}
-	FOREACH_MOD(I_OnLoadModule,OnLoadModule(mod));
+	FOREACH_MOD(OnLoadModule, (mod));
 	/* We give every module a chance to re-prioritize when we introduce a new one,
 	 * not just the one thats loading, as the new module could affect the preference
 	 * of others
@@ -207,6 +208,7 @@ void ModuleManager::LoadAll()
 		Module* mod = i->second;
 		try
 		{
+			AttachAll(mod);
 			mod->init();
 		}
 		catch (CoreException& modexcept)