StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'del-failed-groupchats' of https://github.com/JFreegman/ProjectTox-Core

Browse Source
This commit is contained in:
irungentoo 2014-07-05 22:29:30 -04:00
commit 04b1b2cfd4
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toxcore/Messenger.c
View File

@ -1206,8 +1206,10 @@ int join_groupchat(Messenger *m, int32_t friendnumber, const uint8_t *friend_gro
IP_Port friend_ip = get_friend_ipport(m, friendnumber); IP_Port friend_ip = get_friend_ipport(m, friendnumber);
if (friend_ip.ip.family == 0) if (friend_ip.ip.family == 0) {
del_groupchat(m, groupnum);
return -1; return -1;
}
id_copy(data, friend_group_public_key); id_copy(data, friend_group_public_key);
id_copy(data + crypto_box_PUBLICKEYBYTES, m->chats[groupnum]->self_public_key); id_copy(data + crypto_box_PUBLICKEYBYTES, m->chats[groupnum]->self_public_key);
@ -1218,6 +1220,7 @@ int join_groupchat(Messenger *m, int32_t friendnumber, const uint8_t *friend_gro
return groupnum; return groupnum;
} }
del_groupchat(m, groupnum);
return -1; return -1;
} }