From 7bb75e575b5f6a555a0651057c0cb5b30f93a9d9 Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Wed, 20 May 2015 15:02:24 +0200
Subject: Allow modules to be called as "foo" instead of "m_foo.so"

---
 src/modmanager_dynamic.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/modmanager_dynamic.cpp')

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index fc6161e31..9a687ad2b 100644
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -27,15 +27,16 @@
 
 #ifndef PURE_STATIC
 
-bool ModuleManager::Load(const std::string& filename, bool defer)
+bool ModuleManager::Load(const std::string& modname, bool defer)
 {
 	/* Don't allow people to specify paths for modules, it doesn't work as expected */
-	if (filename.find('/') != std::string::npos)
+	if (modname.find('/') != std::string::npos)
 	{
-		LastModuleError = "You can't load modules with a path: " + filename;
+		LastModuleError = "You can't load modules with a path: " + modname;
 		return false;
 	}
 
+	const std::string filename = ExpandModName(modname);
 	const std::string moduleFile = ServerInstance->Config->Paths.PrependModule(filename);
 
 	if (!FileSystem::FileExists(moduleFile))
-- 
cgit v1.3.1-10-gc9f91