summaryrefslogtreecommitdiff
path: root/toxcore/Messenger.c
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2015-05-26 20:52:09 -0400
committerirungentoo <irungentoo@gmail.com>2015-05-26 20:52:09 -0400
commitce077eeeb3fc418d24176c17bbb07bf47b966021 (patch)
treedcba3bc9aaa55ee85ebceffba05bf1da4cf2dc85 /toxcore/Messenger.c
parentf7d203925fa450ab6774b1fd712a2d033ab4c044 (diff)
Fixed rare bug where userstatus, name, etc... would not be sent to friend.
Diffstat (limited to 'toxcore/Messenger.c')
-rw-r--r--toxcore/Messenger.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 1288b338..4d4b82c1 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -864,6 +864,11 @@ static void check_friend_connectionstatus(Messenger *m, int32_t friendnumber, ui
864 if (was_online) { 864 if (was_online) {
865 break_files(m, friendnumber); 865 break_files(m, friendnumber);
866 clear_receipts(m, friendnumber); 866 clear_receipts(m, friendnumber);
867 } else {
868 m->friendlist[friendnumber].name_sent = 0;
869 m->friendlist[friendnumber].userstatus_sent = 0;
870 m->friendlist[friendnumber].statusmessage_sent = 0;
871 m->friendlist[friendnumber].user_istyping_sent = 0;
867 } 872 }
868 873
869 m->friendlist[friendnumber].status = status; 874 m->friendlist[friendnumber].status = status;
@@ -1891,10 +1896,6 @@ static int handle_status(void *object, int i, uint8_t status)
1891 1896
1892 if (status) { /* Went online. */ 1897 if (status) { /* Went online. */
1893 send_online_packet(m, i); 1898 send_online_packet(m, i);
1894 m->friendlist[i].name_sent = 0;
1895 m->friendlist[i].userstatus_sent = 0;
1896 m->friendlist[i].statusmessage_sent = 0;
1897 m->friendlist[i].user_istyping_sent = 0;
1898 } else { /* Went offline. */ 1899 } else { /* Went offline. */
1899 if (m->friendlist[i].status == FRIEND_ONLINE) { 1900 if (m->friendlist[i].status == FRIEND_ONLINE) {
1900 set_friend_status(m, i, FRIEND_CONFIRMED); 1901 set_friend_status(m, i, FRIEND_CONFIRMED);