aboutsummaryrefslogtreecommitdiff
path: root/src/configreader.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2020-02-09 16:01:52 +0000
committerGravatar Sadie Powell2020-02-09 17:16:07 +0000
commit1cdffcaad7e62f84ca1ee85e8c4265d2701afd08 (patch)
tree48a13b1c4d65ca2c76852680a7dcba4db2696c65 /src/configreader.cpp
parentUse C++11 inline initialisation for class members. (diff)
Move FindUUID to the UserManager class.
Diffstat (limited to 'src/configreader.cpp')
-rw-r--r--src/configreader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp
index cbb78d3d6..7d4e30672 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -510,7 +510,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
}
}
- User* user = useruid.empty() ? NULL : ServerInstance->FindUUID(useruid);
+ User* user = ServerInstance->Users.FindUUID(useruid);
if (!valid)
{
@@ -695,7 +695,7 @@ void ConfigReaderThread::OnStop()
ServerInstance->XLines->CheckELines();
ServerInstance->XLines->ApplyLines();
- User* user = ServerInstance->FindUUID(UUID);
+ User* user = ServerInstance->Users.FindUUID(UUID);
ConfigStatus status(user);
const ModuleManager::ModuleMap& mods = ServerInstance->Modules.GetModules();
for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)