X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_nick.cpp;h=4e2ebcf6e425de17bdc7797a0dac2c03475dd4b5;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=70bb5a63b93f6eb024e66af5bd297116855da1e2;hpb=5fa6825aa319ee37a37b7c7d11f542c83e2f8333;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 70bb5a63b..4e2ebcf6e 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -11,14 +11,14 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "inspircd.h"
 #include "xline.h"
 #include "commands/cmd_nick.h"
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
 	return new cmd_nick(Instance);
 }
@@ -33,7 +33,11 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 	char oldnick[NICKMAX];
 
 	if (!*parameters[0] || !*user->nick)
+	{
+		/* We cant put blanks in the parameters, so for this (extremely rare) issue we just put '*' here. */
+		user->WriteServ("432 %s * :Erroneous Nickname", *user->nick ? user->nick : "*");
 		return CMD_FAILURE;
+	}
 
 	if (irc::string(user->nick) == irc::string(parameters[0]))
 	{
@@ -133,6 +137,15 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 
 	user->InvalidateCache();
 
+	/* Update display nicks */
+	for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
+	{
+		CUList* ulist = v->first->GetUsers();
+		CUList::iterator i = ulist->find(user);
+		if (i != ulist->end())
+			i->second = user->nick;
+	}
+
 	if (user->registered < REG_NICKUSER)
 	{
 		user->registered = (user->registered | REG_NICK);