diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usermanager.cpp | 3 | ||||
| -rw-r--r-- | src/users.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/usermanager.cpp b/src/usermanager.cpp index e3ddfc9f2..670add777 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -74,6 +74,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs ServerInstance->Users->AddGlobalClone(New); New->localuseriter = this->local_users.insert(local_users.end(), New); + local_count++; if ((this->local_users.size() > ServerInstance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)ServerInstance->SE->GetMaxFds())) { @@ -332,7 +333,7 @@ unsigned int UserManager::UnregisteredUserCount() unsigned int UserManager::LocalUserCount() { /* Doesnt count unregistered clients */ - return (this->local_users.size() - this->UnregisteredUserCount()); + return (this->local_count - this->UnregisteredUserCount()); } void UserManager::ServerNoticeAll(const char* text, ...) diff --git a/src/users.cpp b/src/users.cpp index f48e3642f..2305ba8ce 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -545,7 +545,10 @@ CullResult LocalUser::cull() // overwritten in UserManager::AddUser() with the real iterator so this check // is only a precaution currently. if (localuseriter != ServerInstance->Users->local_users.end()) + { + ServerInstance->Users->local_count--; ServerInstance->Users->local_users.erase(localuseriter); + } else ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: LocalUserIter does not point to a valid entry for " + this->nick); |