Backport fix for stripcolour not stripping colour codes, reported by jackmcbarn ...

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 47e12242053344ffe81d1000b51ac91b9fb869b8..1e2e415cde1a2995eb44726e42dc08f8a4e008ff 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -391,6 +391,18 @@ XLineManager::~XLineManager()
        delete KFact;
        delete QFact;
        delete ZFact;
+
+       // Delete all existing XLines
+       for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++)
+       {
+               for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++)
+               {
+                       delete j->second;
+               }
+               i->second.clear();
+       }
+       lookup_lines.clear();
+       
 }
 
 void XLine::Apply(User* u)
@@ -408,6 +420,7 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
        snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
        if (*ServerInstance->Config->MoronBanner)
                u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+
        if (ServerInstance->Config->HideBans)
                ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
        else