From 829ef1b7bd957425e4c1fd03abad404acfeb36ba Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 5 Oct 2014 19:53:48 -0400
Subject: Clear pending collided state on release, fixes colliding users using
 recover into enforcers

---
 modules/commands/ns_recover.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/commands')

diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp
index f4945a639..a412ad96a 100644
--- a/modules/commands/ns_recover.cpp
+++ b/modules/commands/ns_recover.cpp
@@ -95,7 +95,8 @@ class NSRecoverRequest : public IdentifyRequest
 			if (IRCD->CanSVSNick)
 			{
 				/* If we can svsnick then release our hold and svsnick the user using the command */
-				nickserv->Release(na);
+				if (nickserv)
+					nickserv->Release(na);
 				IRCD->SendForceNickChange(source.GetUser(), GetAccount(), Anope::CurTime);
 				source.Reply(_("You have regained control of \002%s\002 and are now identified as \002%s\002."), GetAccount().c_str(), na->nc->display.c_str());
 			}
-- 
cgit