From 29822a263b3b408559257e9ef2bd29167e7573fa Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Wed, 10 Jul 2013 18:11:48 +0100
Subject: Add <path> keys for all of the compile-time paths.

Also, make all paths in the config relative to their associated
directory. This reverts a change in 2.0 which turned out to be a
terrible idea, especially for system-wide installations.
---
 src/modmanager_dynamic.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/modmanager_dynamic.cpp')

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index 92a7e0a32..750a1c448 100644
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -37,7 +37,7 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 	if (filename.find('/') != std::string::npos)
 		return false;
 
-	const std::string moduleFile = ServerInstance->Config->ModPath + "/" + filename;
+	const std::string moduleFile = ServerInstance->Config->Paths.PrependModule(filename);
 
 	if (!ServerConfig::FileExists(moduleFile.c_str()))
 	{
@@ -190,7 +190,7 @@ void ModuleManager::LoadAll()
 	std::cout << std::endl << "Loading core commands";
 	fflush(stdout);
 
-	DIR* library = opendir(ServerInstance->Config->ModPath.c_str());
+	DIR* library = opendir(ServerInstance->Config->Paths.Module.c_str());
 	if (library)
 	{
 		dirent* entry = NULL;
-- 
cgit v1.3.1-10-gc9f91