summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzugz (tox) <mbays+tox@sdf.org>2018-08-23 20:32:59 +0200
committeriphydf <iphydf@users.noreply.github.com>2018-08-25 15:39:31 +0000
commitd380c411317db1baa176ce525fec5919a4cbdff6 (patch)
treeb40e3ef8bea35c34859ad01fbf3e745857381d46
parent94b06818fbd7a93387ff4c155b6eff711651aea9 (diff)
fix leave callback calling in del_groupchat
-rw-r--r--toxcore/group.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/toxcore/group.c b/toxcore/group.c
index 11467605..5372eedb 100644
--- a/toxcore/group.c
+++ b/toxcore/group.c
@@ -822,9 +822,7 @@ int del_groupchat(Group_Chats *g_c, uint32_t groupnumber)
822 822
823 group_kill_peer_send(g_c, groupnumber, g->peer_number); 823 group_kill_peer_send(g_c, groupnumber, g->peer_number);
824 824
825 unsigned int i; 825 for (uint32_t i = 0; i < MAX_GROUP_CONNECTIONS; ++i) {
826
827 for (i = 0; i < MAX_GROUP_CONNECTIONS; ++i) {
828 if (g->close[i].type == GROUPCHAT_CLOSE_NONE) { 826 if (g->close[i].type == GROUPCHAT_CLOSE_NONE) {
829 continue; 827 continue;
830 } 828 }
@@ -833,8 +831,10 @@ int del_groupchat(Group_Chats *g_c, uint32_t groupnumber)
833 kill_friend_connection(g_c->fr_c, g->close[i].number); 831 kill_friend_connection(g_c->fr_c, g->close[i].number);
834 } 832 }
835 833
836 if (g->peer_on_leave) { 834 for (uint32_t i = 0; i < g->numpeers; ++i) {
837 g->peer_on_leave(g->object, groupnumber, g->group[i].object); 835 if (g->peer_on_leave) {
836 g->peer_on_leave(g->object, groupnumber, g->group[i].object);
837 }
838 } 838 }
839 839
840 free(g->group); 840 free(g->group);