Merge pull request #2 from briancollins/master

Fix IRC_Send_NAMES not sending correct prefix for certain clients.
This commit is contained in:
Alexander Barton 2012-09-11 11:29:14 -07:00
commit a072180c92
1 changed files with 4 additions and 4 deletions

View File

@ -1595,10 +1595,10 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
if (is_member || is_visible) { if (is_member || is_visible) {
if (str[strlen(str) - 1] != ':') if (str[strlen(str) - 1] != ':')
strlcat(str, " ", sizeof(str)); strlcat(str, " ", sizeof(str));
if (Client_Cap(cl) & CLIENT_CAP_MULTI_PREFIX) { if (Client_Cap(Client) & CLIENT_CAP_MULTI_PREFIX &&
if (strchr(Channel_UserModes(Chan, cl), 'o') && strchr(Channel_UserModes(Chan, cl), 'o') &&
strchr(Channel_UserModes(Chan, cl), 'v')) strchr(Channel_UserModes(Chan, cl), 'v')) {
strlcat(str, "@+", sizeof(str)); strlcat(str, "@+", sizeof(str));
} else { } else {
if (strchr(Channel_UserModes(Chan, cl), 'o')) if (strchr(Channel_UserModes(Chan, cl), 'o'))
strlcat(str, "@", sizeof(str)); strlcat(str, "@", sizeof(str));