m_spanningtree Remove SpanningTreeUtilities* fields and parameters

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index 5fc8ffc471bddb6ea0ad99b7573b07d6cbd4f08f..47c99408838ee58136c549f164f6283ee856a8d6 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -577,7 +577,8 @@ FileReader::FileReader(const std::string& filename)
 void FileReader::Load(const std::string& filename)
 {
        // If the file is stored in the file cache then we used that version instead.
-       ConfigFileCache::iterator it = ServerInstance->Config->Files.find(filename);
+       std::string realName = ServerInstance->Config->Paths.PrependConfig(filename);
+       ConfigFileCache::iterator it = ServerInstance->Config->Files.find(realName);
        if (it != ServerInstance->Config->Files.end())
        {
                this->lines = it->second;
@@ -586,7 +587,7 @@ void FileReader::Load(const std::string& filename)
        {
                lines.clear();
 
-               std::ifstream stream(filename.c_str());
+               std::ifstream stream(realName.c_str());
                if (!stream.is_open())
                        throw CoreException(filename + " does not exist or is not readable!");