aboutsummaryrefslogtreecommitdiff
path: root/src/configreader.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2019-05-15 16:22:24 +0100
committerGravatar Sadie Powell2019-05-15 21:06:09 +0100
commit03d3563ef95efc6ab8076d66ebda48545c6089c4 (patch)
tree0160e0a3b333a000c7c880d9373b46cfa3968e79 /src/configreader.cpp
parentMerge branch 'insp3' into master. (diff)
Replace socketengine_{pthread,win32} with C++11 threads.
Diffstat (limited to 'src/configreader.cpp')
-rw-r--r--src/configreader.cpp8
1 files changed, 4 insertions, 4 deletions
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();