diff options
author | irungentoo <irungentoo@gmail.com> | 2015-05-26 20:30:24 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2015-05-26 20:30:24 -0400 |
commit | f7d203925fa450ab6774b1fd712a2d033ab4c044 (patch) | |
tree | 131eff2b67e320e3c6340b2ceeed4307ed6d3558 /toxcore/Messenger.c | |
parent | 51c5810d72cd81c0aaec9c10289185294112f3f5 (diff) |
Fixed bug when deleting friend that we are connected to in group chat.
Diffstat (limited to 'toxcore/Messenger.c')
-rw-r--r-- | toxcore/Messenger.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index dc0e605a..1288b338 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c | |||
@@ -384,12 +384,12 @@ int m_delfriend(Messenger *m, int32_t friendnumber) | |||
384 | clear_receipts(m, friendnumber); | 384 | clear_receipts(m, friendnumber); |
385 | remove_request_received(&(m->fr), m->friendlist[friendnumber].real_pk); | 385 | remove_request_received(&(m->fr), m->friendlist[friendnumber].real_pk); |
386 | friend_connection_callbacks(m->fr_c, m->friendlist[friendnumber].friendcon_id, MESSENGER_CALLBACK_INDEX, 0, 0, 0, 0, 0); | 386 | friend_connection_callbacks(m->fr_c, m->friendlist[friendnumber].friendcon_id, MESSENGER_CALLBACK_INDEX, 0, 0, 0, 0, 0); |
387 | kill_friend_connection(m->fr_c, m->friendlist[friendnumber].friendcon_id); | ||
388 | 387 | ||
389 | if (friend_con_connected(m->fr_c, m->friendlist[friendnumber].friendcon_id) == FRIENDCONN_STATUS_CONNECTED) { | 388 | if (friend_con_connected(m->fr_c, m->friendlist[friendnumber].friendcon_id) == FRIENDCONN_STATUS_CONNECTED) { |
390 | send_offline_packet(m, m->friendlist[friendnumber].friendcon_id); | 389 | send_offline_packet(m, m->friendlist[friendnumber].friendcon_id); |
391 | } | 390 | } |
392 | 391 | ||
392 | kill_friend_connection(m->fr_c, m->friendlist[friendnumber].friendcon_id); | ||
393 | memset(&(m->friendlist[friendnumber]), 0, sizeof(Friend)); | 393 | memset(&(m->friendlist[friendnumber]), 0, sizeof(Friend)); |
394 | uint32_t i; | 394 | uint32_t i; |
395 | 395 | ||