m_spanningtree Fix routing of ROUTE_TYPE_MESSAGE messages

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 368ca6e8bd3cdefa4f61f8f9ebfa436639b54cc4..75e9f3699d0966a84aff310ffdafeeae0229c7b9 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -120,7 +120,10 @@ void InspIRCd::Cleanup()
        /* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */
        /* Must be deleted before modes as it decrements modelines */
        if (FakeClient)
+       {
+               delete FakeClient->server;
                FakeClient->cull();
+       }
        DeleteZero(this->FakeClient);
        DeleteZero(this->Users);
        DeleteZero(this->Modes);
@@ -380,14 +383,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;
                }
@@ -457,7 +460,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        this->UIDGen.init(Config->sid);
 
        // Create the server user for this server
-       this->FakeClient = new FakeUser(Config->sid, Config->ServerName);
+       this->FakeClient = new FakeUser(Config->sid, Config->ServerName, Config->ServerDesc);
 
        // This is needed as all new XLines are marked pending until ApplyLines() is called
        this->XLines->ApplyLines();