X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=1e2e415cde1a2995eb44726e42dc08f8a4e008ff;hb=1fc43c1cab6a02df61955dc48dbf6bef3c586c4f;hp=c964ec96266b8f3c2455125cbcf43ac5ad7e740a;hpb=ef30d86d11696bb7ca639ae7a156a0c91d396cdb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index c964ec962..1e2e415cd 100644
--- 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,10 +420,11 @@ 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)
-		User::QuitUser(ServerInstance, u, line + "-Lined", sreason);
+		ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
 	else
-		User::QuitUser(ServerInstance, u, sreason);
+		ServerInstance->Users->QuitUser(u, sreason);
 
 
 	if (bancache)