Merge pull request #2 from briancollins/master

Fix IRC_Send_NAMES not sending correct prefix for certain clients.

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 6eb8d9421922e8606e0e5cbd83729f1c90c7d4b5..fc04773ae14ef307d1ac5adb0b53f2a18a64dd03 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -1595,10 +1595,10 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
                if (is_member || is_visible) {
                        if (str[strlen(str) - 1] != ':')
                                strlcat(str, " ", sizeof(str));
-                       if (Client_Cap(cl) & CLIENT_CAP_MULTI_PREFIX) {
-                               if (strchr(Channel_UserModes(Chan, cl), 'o') &&
-                                   strchr(Channel_UserModes(Chan, cl), 'v'))
-                                       strlcat(str, "@+", sizeof(str));
+                       if (Client_Cap(Client) & CLIENT_CAP_MULTI_PREFIX && 
+                                       strchr(Channel_UserModes(Chan, cl), 'o') &&
+                                       strchr(Channel_UserModes(Chan, cl), 'v')) {
+                               strlcat(str, "@+", sizeof(str));
                        } else {
                                if (strchr(Channel_UserModes(Chan, cl), 'o'))
                                        strlcat(str, "@", sizeof(str));