From 03d3563ef95efc6ab8076d66ebda48545c6089c4 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 15 May 2019 16:22:24 +0100 Subject: Replace socketengine_{pthread,win32} with C++11 threads. --- src/configreader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/configreader.cpp') diff --git a/src/configreader.cpp b/src/configreader.cpp index b844be382..666d7a492 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -661,18 +661,18 @@ std::string ServerConfig::Escape(const std::string& str) return escaped; } -void ConfigReaderThread::Run() +void ConfigReaderThread::OnStart() { Config->Read(); done = true; } -void ConfigReaderThread::Finish() +void ConfigReaderThread::OnStop() { ServerConfig* old = ServerInstance->Config; ServerInstance->Logs.Log("CONFIG", LOG_DEBUG, "Switching to new configuration..."); ServerInstance->Config = this->Config; - Config->Apply(old, TheUserUID); + Config->Apply(old, UUID); if (Config->valid) { @@ -685,7 +685,7 @@ void ConfigReaderThread::Finish() ServerInstance->Users.RehashCloneCounts(); ServerInstance->XLines->CheckELines(); ServerInstance->XLines->ApplyLines(); - User* user = ServerInstance->FindNick(TheUserUID); + User* user = ServerInstance->FindUUID(UUID); ConfigStatus status(user); const ModuleManager::ModuleMap& mods = ServerInstance->Modules.GetModules(); -- cgit v1.3.1-10-gc9f91