Merge insp20

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index e607c6e7d72e635564cbbae5ab7cdf9b3d968b4e..8a432e82f6a74f836038a4ebfdfb1627dd473196 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -409,6 +409,7 @@ void ServerConfig::Fill()
        HideBans = security->getBool("hidebans");
        HideWhoisServer = security->getString("hidewhois");
        HideKillsServer = security->getString("hidekills");
+       HideULineKills = security->getBool("hideulinekills");
        RestrictBannedUsers = security->getBool("restrictbannedusers", true);
        GenericOper = security->getBool("genericoper");
        SyntaxHints = options->getBool("syntaxhints");
@@ -567,7 +568,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 
        // write once here, to try it out and make sure its ok
        if (valid)
-               ServerInstance->WritePID(this->PID);
+               ServerInstance->WritePID(this->PID, !old);
 
        ConfigTagList binds = ConfTags("bind");
        if (binds.first == binds.second)