From bc06c7b2b01fabca410deec83a884a079f03d03c Mon Sep 17 00:00:00 2001 From: irungentoo Date: Mon, 25 Nov 2013 19:45:04 -0500 Subject: Behaviour changes for the group chat callback. --- toxcore/group_chats.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'toxcore') diff --git a/toxcore/group_chats.c b/toxcore/group_chats.c index ec9229c4..1637f181 100644 --- a/toxcore/group_chats.c +++ b/toxcore/group_chats.c @@ -255,10 +255,7 @@ static int delpeer(Group_Chat *chat, int peernum) chat->group = temp; if (chat->peer_namelistchange != NULL) { - (*chat->peer_namelistchange)(chat, chat->numpeers, CHAT_CHANGE_PEER_DEL, chat->group_namelistchange_userdata); - - if (chat->numpeers != (uint32_t)peernum) - (*chat->peer_namelistchange)(chat, peernum, CHAT_CHANGE_PEER_NAME, chat->group_namelistchange_userdata); + (*chat->peer_namelistchange)(chat, peernum, CHAT_CHANGE_PEER_DEL, chat->group_namelistchange_userdata); } return 0; @@ -291,9 +288,9 @@ static void setnick(Group_Chat *chat, int peernum, uint8_t *contents, uint16_t c return; /* same name as already stored? */ - if ((chat->group[peernum].nick_len == contents_len) && - !memcmp(chat->group[peernum].nick, contents, contents_len)) - return; + if (chat->group[peernum].nick_len == contents_len) + if (!memcmp(chat->group[peernum].nick, contents, contents_len)) + return; memcpy(chat->group[peernum].nick, contents, contents_len); /* Force null termination */ -- cgit v1.2.3