Remove AllowHalfop item from server config

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 5fa56ba8f06a6fbeb09ef83c9122a5890fd2524e..9e0aa20315655d30ad02b719020a8c8e51cc394e 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -37,7 +37,7 @@ ServerConfig::ServerConfig()
 {
        WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
        NoUserDns = OperSpyWhois = HideBans = HideSplits = UndernetMsgPrefix = false;
-       CycleHosts = AllowHalfop = InvBypassModes = true;
+       CycleHosts = InvBypassModes = true;
        dns_timeout = DieDelay = 5;
        MaxTargets = 20;
        NetBufferSize = 10240;
@@ -925,7 +925,6 @@ std::string ServerConfig::GetSID()
 
 void ConfigReaderThread::Run()
 {
-       Config = new ServerConfig;
        Config->Read();
        done = true;
 }
@@ -957,7 +956,7 @@ void ConfigReaderThread::Finish()
                FOREACH_MOD(I_OnRehash, OnRehash(user));
                ServerInstance->BuildISupport();
 
-               delete old;
+               Config = old;
        }
        else
        {
@@ -965,6 +964,5 @@ void ConfigReaderThread::Finish()
                ServerInstance->Logs->CloseLogs();
                ServerInstance->Config = old;
                ServerInstance->Logs->OpenFileLogs();
-               delete this->Config;
        }
 }