summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2013-09-22 10:53:00 -0700
committerirungentoo <irungentoo@gmail.com>2013-09-22 10:53:00 -0700
commit115cb8af02f81464852f7df0cc20462947cf1f48 (patch)
tree3b1ce16738c621cea5bcb2767d30f2941685b738
parent64150f4bde73f4b4748a3e46664a2930a3635054 (diff)
parentbb0cd7da0c86356ac3413045cd3683281b2bded4 (diff)
Merge pull request #600 from Jman012/master
Fixed a bug or two.
-rw-r--r--toxcore/Messenger.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 43db2a9d..cb588adf 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 {