summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2013-08-11 06:28:35 -0700
committerirungentoo <irungentoo@gmail.com>2013-08-11 06:28:35 -0700
commit31bf4aece77e15993169b1fa3aa8654a16699f01 (patch)
treeebbcb954f427196d11e788125efb0d72908abe73 /core
parente5e5ec6f57d2b61e585889185623f6acb303b55c (diff)
parent851c52571f5024000ee17b7b41fb5ce69960104a (diff)
Merge pull request #427 from Alek900/master
m_addfriend triggerd m_callback_friendstatus with a friendid thats not yet returned from m_addfriend
Diffstat (limited to 'core')
-rw-r--r--core/Messenger.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Messenger.c b/core/Messenger.c
index 37ab5e2d..d340f5f8 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -138,7 +138,7 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
138 for (i = 0; i <= numfriends; ++i) { 138 for (i = 0; i <= numfriends; ++i) {
139 if (friendlist[i].status == NOFRIEND) { 139 if (friendlist[i].status == NOFRIEND) {
140 DHT_addfriend(client_id); 140 DHT_addfriend(client_id);
141 set_friend_status(i, FRIEND_ADDED); 141 friendlist[i].status = FRIEND_ADDED;
142 friendlist[i].crypt_connection_id = -1; 142 friendlist[i].crypt_connection_id = -1;
143 friendlist[i].friend_request_id = -1; 143 friendlist[i].friend_request_id = -1;
144 memcpy(friendlist[i].client_id, client_id, CLIENT_ID_SIZE); 144 memcpy(friendlist[i].client_id, client_id, CLIENT_ID_SIZE);