m_auditorium Switch to SimpleChannelModeHandler

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 8336a48473f21d48e180803e6d4b7bdbe68df092..de92872700347dcadb60d03d3d7a6f3d9806a664 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -335,7 +335,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
                {
                        case 'c':
                                /* Config filename was set */
-                               ConfigFileName = optarg;
+                               ConfigFileName = ServerInstance->Config->Paths.PrependConfig(optarg);
                        break;
                        case 0:
                                /* getopt_long_only() set an int variable, just keep going */
@@ -380,14 +380,14 @@ InspIRCd::InspIRCd(int argc, char** argv) :
                Logs->AddLogTypes("*", fls, true);
        }
 
-       if (!ServerConfig::FileExists(ConfigFileName.c_str()))
+       if (!FileSystem::FileExists(ConfigFileName))
        {
 #ifdef _WIN32
                /* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */
                std::string txtconf = this->ConfigFileName;
                txtconf.append(".txt");
 
-               if (ServerConfig::FileExists(txtconf.c_str()))
+               if (FileSystem::FileExists(txtconf))
                {
                        ConfigFileName = txtconf;
                }