diff options
author | irungentoo <irungentoo@gmail.com> | 2013-09-22 14:26:24 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-09-22 14:26:24 -0400 |
commit | 757c958132ca1a81bfa2d879931d5fba4e5c082e (patch) | |
tree | b0b4f82575e2e2f7659194aaaaac0f530840c42f | |
parent | 0d54a675ecb884d0b368c48ce5b2bd7dad09ee04 (diff) | |
parent | 115cb8af02f81464852f7df0cc20462947cf1f48 (diff) |
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
-rw-r--r-- | toxcore/Messenger.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 9089144a..32e81389 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c | |||
@@ -1182,6 +1182,8 @@ void doFriends(Messenger *m) | |||
1182 | 1182 | ||
1183 | if (m->group_invite) | 1183 | if (m->group_invite) |
1184 | (*m->group_invite)(m, i, data, m->group_invite_userdata); | 1184 | (*m->group_invite)(m, i, data, m->group_invite_userdata); |
1185 | |||
1186 | break; | ||
1185 | } | 1187 | } |
1186 | 1188 | ||
1187 | case PACKET_ID_JOIN_GROUPCHAT: { | 1189 | case PACKET_ID_JOIN_GROUPCHAT: { |
@@ -1197,6 +1199,12 @@ void doFriends(Messenger *m) | |||
1197 | break; | 1199 | break; |
1198 | 1200 | ||
1199 | group_newpeer(m->chats[groupnum], data + crypto_box_PUBLICKEYBYTES); | 1201 | group_newpeer(m->chats[groupnum], data + crypto_box_PUBLICKEYBYTES); |
1202 | |||
1203 | break; | ||
1204 | } | ||
1205 | |||
1206 | default: { | ||
1207 | break; | ||
1200 | } | 1208 | } |
1201 | } | 1209 | } |
1202 | } else { | 1210 | } else { |