diff options
author | irungentoo <irungentoo@gmail.com> | 2013-09-24 18:22:18 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-09-24 18:22:18 -0400 |
commit | 7c300370b07ae0afbaaa9bf8c5562930823550c8 (patch) | |
tree | fa5370d98946d86b53c7c478b99a97c7761f2d91 | |
parent | 4a3bed3e850af7aee70bc37bb75ddc913b7a56c0 (diff) | |
parent | 1994c3cd890ffed436e3a41bc4a1fb642b056b91 (diff) |
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
-rw-r--r-- | toxcore/Messenger.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index f125c264..f22a8d57 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c | |||
@@ -516,8 +516,10 @@ static int send_userstatus(Messenger *m, int friendnumber, USERSTATUS status) | |||
516 | 516 | ||
517 | static int send_ping(Messenger *m, int friendnumber) | 517 | static int send_ping(Messenger *m, int friendnumber) |
518 | { | 518 | { |
519 | m->friendlist[friendnumber].ping_lastsent = unix_time(); | 519 | int ret = write_cryptpacket_id(m, friendnumber, PACKET_ID_PING, 0, 0); |
520 | return write_cryptpacket_id(m, friendnumber, PACKET_ID_PING, 0, 0); | 520 | if (ret == 1) |
521 | m->friendlist[friendnumber].ping_lastsent = unix_time(); | ||
522 | return ret; | ||
521 | } | 523 | } |
522 | 524 | ||
523 | static int set_friend_statusmessage(Messenger *m, int friendnumber, uint8_t *status, uint16_t length) | 525 | static int set_friend_statusmessage(Messenger *m, int friendnumber, uint8_t *status, uint16_t length) |