X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/ac408af6cba5a230c66186d4389e60766c3a74a4..10f11ca3b5c3b864dc643bf82e5a6c706fb3c98f:/modules/core/m_nick.c

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 4deeed6..62720c1 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_nick.c 3518 2007-06-22 21:59:09Z jilles $
  */
 
 #include "stdinc.h"
@@ -691,6 +690,16 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
 					nick, chptr->chname);
 			return;
 		}
+
+		chptr = find_nonickchange_channel(source_p);
+		if (chptr != NULL)
+		{
+			sendto_one_numeric(source_p, ERR_NONICK,
+					form_str(ERR_NONICK),
+					chptr->chname);
+			return;
+		}
+
 		if((source_p->localClient->last_nick_change + ConfigFileEntry.max_nick_time) < rb_current_time())
 			source_p->localClient->number_of_nick_changes = 0;