X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodmanager_static.cpp;h=98ed26c672c1fe787512e912aa13ba455b400d2a;hb=df9bd50866a1ee95db78b88090aae74e245ad469;hp=76f16fa92fd140e2594a0ab9062c70b46c99f2b2;hpb=992674362c5f64bdb8e1942eeaa7612524529cd6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index 76f16fa92..98ed26c67 100644
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -69,8 +69,7 @@ class AllModule : public Module
 
 	~AllModule()
 	{
-		for(std::vector<Command*>::iterator i = cmds.begin(); i != cmds.end(); ++i)
-			delete *i;
+		stdalgo::delete_all(cmds);
 	}
 
 	Version GetVersion()
@@ -81,8 +80,9 @@ class AllModule : public Module
 
 MODULE_INIT(AllModule)
 
-bool ModuleManager::Load(const std::string& name, bool defer)
+bool ModuleManager::Load(const std::string& inputname, bool defer)
 {
+	const std::string name = ExpandModName(inputname);
 	modmap::iterator it = modlist->find(name);
 	if (it == modlist->end())
 		return false;