mirror of
https://github.com/znc/znc.git
synced 2026-03-28 17:42:41 +01:00
Added CUser::IsBeingDeleted() to allow for different messaging when a user is being deleted vs detaching or disconnecting
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@703 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
7
znc.cpp
7
znc.cpp
@@ -34,6 +34,10 @@ CZNC::~CZNC() {
|
||||
delete m_vpListeners[b];
|
||||
}
|
||||
|
||||
for (map<CString,CUser*>::iterator a = m_msUsers.begin(); a != m_msUsers.end(); a++) {
|
||||
a->second->SetBeingDeleted(true);
|
||||
}
|
||||
|
||||
m_Manager.Cleanup();
|
||||
DeleteUsers();
|
||||
delete m_pModules;
|
||||
@@ -76,9 +80,11 @@ int CZNC::Loop() {
|
||||
if (m_ssDelUsers.size()) {
|
||||
for (set<CUser*>::iterator it = m_ssDelUsers.begin(); it != m_ssDelUsers.end(); it++) {
|
||||
CUser* pUser = *it;
|
||||
pUser->SetBeingDeleted(true);
|
||||
|
||||
#ifdef _MODULES
|
||||
if (GetModules().OnDeleteUser(*pUser)) {
|
||||
pUser->SetBeingDeleted(false);
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
@@ -250,6 +256,7 @@ bool CZNC::WritePemFile() {
|
||||
|
||||
void CZNC::DeleteUsers() {
|
||||
for (map<CString,CUser*>::iterator a = m_msUsers.begin(); a != m_msUsers.end(); a++) {
|
||||
a->second->SetBeingDeleted(true);
|
||||
delete a->second;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user