From 0b64cbc1d28bd20316ff7bfdb908b9b1eec63641 Mon Sep 17 00:00:00 2001
From: DukePyrolator <DukePyrolator@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Wed, 28 Oct 2009 22:12:36 +0000
Subject: [PATCH] renaming to guestnick was not working properly

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2594 5417fbe8-f217-4b02-8779-1006273d7864
---
 src/nickserv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nickserv.c b/src/nickserv.c
index 0122f7517..de9b6de88 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -67,7 +67,7 @@ class NickServCollide : public Timer
 	{
 		/* If they identified or don't exist anymore, don't kill them. */
 		User *u = finduser(na->nick);
-		if (!u || nick_identified(u) || u->my_signon > this->GetSetTime())
+		if (!u || u->nc == na->nc || u->my_signon > this->GetSetTime())
 			return;
 
 		/* The RELEASE timeout will always add to the beginning of the