diff options
| author |  Attila Molnar | 2015-04-20 17:40:12 +0200 |
|---|---|---|
| committer | Attila Molnar | 2015-04-20 17:40:12 +0200 |
| commit | 8f5efbc7aa33b792e02d01e3288f553e6e98ccaa (patch) | |
| tree | 54a67ebd11fac07d630fa03acad7797b2f781e80 /src/configreader.cpp | |
| parent | Remove exception handling from StreamSocket methods calling IOHooks (diff) | |
| parent | Release v2.0.19 (diff) | |
| download | inspircd++-8f5efbc7aa33b792e02d01e3288f553e6e98ccaa.tar.gz inspircd++-8f5efbc7aa33b792e02d01e3288f553e6e98ccaa.tar.bz2 inspircd++-8f5efbc7aa33b792e02d01e3288f553e6e98ccaa.zip | |
Merge insp20
Diffstat (limited to 'src/configreader.cpp')
| -rw-r--r-- | src/configreader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp index d52f3de13..68495623c 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -53,6 +53,7 @@ static ConfigTag* CreateEmptyTag() ServerConfig::ServerConfig() : EmptyTag(CreateEmptyTag()) , Limits(EmptyTag) + , NoSnoticeStack(false) { RawLog = HideBans = HideSplits = UndernetMsgPrefix = false; WildcardIPv6 = InvBypassModes = true; @@ -575,7 +576,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) errstr << "Possible configuration error: you have not defined any <bind> blocks." << std::endl << "You will need to do this if you want clients to be able to connect!" << std::endl; - if (old) + if (old && valid) { // On first run, ports are bound later on FailedPortList pl; @@ -784,6 +785,7 @@ void ConfigReaderThread::Finish() * XXX: The order of these is IMPORTANT, do not reorder them without testing * thoroughly!!! */ + ServerInstance->Users.RehashCloneCounts(); ServerInstance->XLines->CheckELines(); ServerInstance->XLines->ApplyLines(); ChanModeReference ban(NULL, "ban"); |