First check if channel has mode "N", then check membership

[ngircd-alex.git] / src / ngircd / irc-login.c

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 35026e5587300d08ebb61f9bf9af3a9f99824475..9fca622ba0ea66422940e2d71dc2dff0d5f2eee4 100644 (file)
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -266,8 +266,8 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
                           !Client_HasMode(Client, 'o')) {
                                chan = Channel_First();
                                while (chan) {
-                                       if(Channel_IsMemberOf(chan, Client) &&
-                                          Channel_HasMode(chan, 'N'))
+                                       if(Channel_HasMode(chan, 'N') &&
+                                          Channel_IsMemberOf(chan, Client))
                                                return IRC_WriteErrClient(Client,
                                                                          ERR_NONICKCHANGE_MSG,
                                                                          Client_ID(Client),