Fix quietbans and hidesplits etc, cull list's sending a seperate quit message to...

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 224591b6f82f5610f19439745781b41d47f4e722..db9d4978e262f644b8c33e5819f7a54502be368a 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -51,7 +51,7 @@ int CullList::Apply()
                User *u = (*a);
                user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
                const char* preset_reason = u->GetOperQuit();
-               std::string reason = u->operquitmsg;
+               std::string reason = u->quitmsg;
                std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg;
 
                if (reason.length() > MAXQUIT - 1)
@@ -80,11 +80,11 @@ int CullList::Apply()
 
                if (IS_LOCAL(u))
                {
-                       if (ServerInstance->Config->GetIOHook(u->GetPort()))
+                       if (u->io)
                        {
                                try
                                {
-                                       ServerInstance->Config->GetIOHook(u->GetPort())->OnRawSocketClose(u->GetFd());
+                                       u->io->OnRawSocketClose(u->GetFd());
                                }
                                catch (CoreException& modexcept)
                                {