Spotted problem: must clear out all prefixes attached to a user when they quit or...

[user/henk/code/inspircd.git] / src / cull_list.cpp

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index bfa37e51a77458253cfdbc13121ea73dc6da21b2..74e16e64ed4765fe71383aa97a421d55998b1bea 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -29,18 +29,15 @@ using namespace std;
 #include "modules.h"
 #include "dynamic.h"
 #include "wildcard.h"
-#include "message.h"
 #include "commands.h"
 #include "xline.h"
 #include "inspstring.h"
 #include "inspircd.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "typedefs.h"
 #include "cull_list.h"
 
-extern InspIRCd* ServerInstance;
-
 /*
  * In current implementation of CullList, this isn't used. It did odd things with a lot of sockets.
  */
@@ -99,7 +96,7 @@ std::string& CullItem::GetReason()
        return this->reason;
 }
 
-CullList::CullList()
+CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
        list.clear();
        exempt.clear();
@@ -132,7 +129,7 @@ int CullList::Apply()
        {
                std::vector<CullItem>::iterator a = list.begin();
 
-               userrec::QuitUser(a->GetUser(), a->GetReason().c_str());
+               userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str());
                list.erase(list.begin());
        }
        return n;