Fix recursion in QuitUser

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10809 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index bfbe518cbbb0b781c09bd0f23979b03e5711a6a6..2ec3799ccd0bbace6eef0933bf29b2dc3d27af2f 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -23,13 +23,6 @@ CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 
 void CullList::AddItem(User* user)
 {
-       if (user->quitting)
-       {
-               ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str());
-               return;
-       }
-
-       user->quitting = true;
        list.push_back(user);
 }
 

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 521dcec417d18765f6943257f56f04e560c8aacf..58c9b4e3e952a9f745e3aa7478d81dc420446cfa 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -172,8 +172,15 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 
 void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
 {
+       if (user->quitting)
+       {
+               ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str());
+               return;
+       }
+
        ServerInstance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", user->nick.c_str(), quitreason.c_str());
        user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str());
+       user->quitting = true;
        user->quietquit = false;
        user->quitmsg = quitreason;