From 828f256a9bd8278540bf4beede36c485e2c3e86f Mon Sep 17 00:00:00 2001 From: danieldg Date: Mon, 20 Apr 2009 13:29:58 +0000 Subject: Use loopCall to protect OnUserKick rather than the triggerevents hack git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11321 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/main.cpp | 2 ++ src/modules/m_spanningtree/treesocket2.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/modules/m_spanningtree') diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 01048e4d1..b38929ad0 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -677,6 +677,8 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick) void ModuleSpanningTree::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) { + if (loopCall) + return; if ((source) && (IS_LOCAL(source))) { std::deque params; diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 3e3fbd71e..b298ae369 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -451,7 +451,7 @@ bool TreeSocket::ProcessLine(std::string &line) User* user = this->ServerInstance->FindNick(nick); if (user) { - if (!chan->ServerKickUser(user, params[2].c_str(), false, pf->GetName().c_str())) + if (!chan->ServerKickUser(user, params[2].c_str(), pf->GetName().c_str())) /* Yikes, the channels gone! */ delete chan; } -- cgit v1.2.3