mirror of
https://github.com/znc/znc.git
synced 2026-08-08 09:52:55 +02:00
Change the list of to-be-deleted users into a std::map
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@893 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
@@ -142,9 +142,13 @@ int CZNC::Loop() {
|
||||
|
||||
while (true) {
|
||||
// Check for users that need to be deleted
|
||||
if (m_ssDelUsers.size()) {
|
||||
for (set<CUser*>::iterator it = m_ssDelUsers.begin(); it != m_ssDelUsers.end(); it++) {
|
||||
CUser* pUser = *it;
|
||||
map<CString, CUser*>::iterator it;
|
||||
map<CString, CUser*>::iterator end;
|
||||
|
||||
if (m_msDelUsers.size()) {
|
||||
end = m_msDelUsers.end();
|
||||
for (it = m_msDelUsers.begin(); it != end; it++) {
|
||||
CUser* pUser = it->second;
|
||||
pUser->SetBeingDeleted(true);
|
||||
|
||||
#ifdef _MODULES
|
||||
@@ -170,7 +174,7 @@ int CZNC::Loop() {
|
||||
delete pUser;
|
||||
}
|
||||
|
||||
m_ssDelUsers.clear();
|
||||
m_msDelUsers.clear();
|
||||
RestartConnectUser();
|
||||
WriteConfig();
|
||||
}
|
||||
@@ -1298,7 +1302,7 @@ bool CZNC::DeleteUser(const CString& sUsername) {
|
||||
return false;
|
||||
}
|
||||
|
||||
m_ssDelUsers.insert(pUser);
|
||||
m_msDelUsers[pUser->GetUserName()] = pUser;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user