userrec::UpdateNickHash(), userrec::ForceNickChange(), userrec::FullConnect()

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4793 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 6 insertions, 1 deletions

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 09b585b14..561bca613 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -50,7 +50,12 @@ class cmd_sanick : public command_t
 				// FIX by brain: Cant use source->nick here because if it traverses a server link then
 				// source->nick becomes invalid as the object data moves in memory.
 				Srv->SendOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
-				Srv->ChangeUserNick(source,std::string(parameters[1]));
+				if (!source->ForceNickChange(parameters[1]))
+				{
+					/* We couldnt change the nick */
+					userrec::QuitUser(source, "Nickname collision");
+					return;
+				}
 			}
 		}
 	}