From bdb00322e3ecb9eb213ce01688089cdad39304f0 Mon Sep 17 00:00:00 2001 From: irungentoo Date: Sat, 5 Jul 2014 12:46:58 -0400 Subject: Fixed bug when loading friends list already containing an added friend. --- toxcore/Messenger.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 4344fdcb..2adbd870 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c @@ -2598,6 +2598,10 @@ static int friends_list_load(Messenger *m, const uint8_t *data, uint32_t length) if (temp.status >= 3) { int fnum = m_addfriend_norequest(m, temp.client_id); + + if (fnum < 0) + continue; + setfriendname(m, fnum, temp.name, ntohs(temp.name_length)); set_friend_statusmessage(m, fnum, temp.statusmessage, ntohs(temp.statusmessage_length)); set_friend_userstatus(m, fnum, temp.userstatus); -- cgit v1.2.3