Add a warning about quitting a user twice, and fix a minor brainfart

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 365cca2319d9c2cdfb1c8e65b4a7158440955515..fee326ea3ccc324e33d040ceb61b5ec247bd90a4 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -24,8 +24,12 @@ CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 void CullList::AddItem(User* user)
 {
        if (user->quitting)
+       {
+               ServerInstance->Log(DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick);
                return;
+       }
 
+       user->quitting = true;
        list.push_back(user);
 }
 

diff --git a/src/users.cpp b/src/users.cpp
index 5f37d08bbbd31c1cae9fdcff611d1bab008f3564..6d902027dda9ca90d6708a9a2476d310217695f9 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -708,7 +708,6 @@ void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreaso
 {
        Instance->Log(DEBUG,"QuitUser: %s '%s'", user->nick, quitreason.c_str());
        user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, *operreason ? operreason : quitreason.c_str());
-       user->quitting = true;
        user->quietquit = false;
        user->quitmsg = quitreason;
        user->operquitmsg = operreason;