diff options
author | irungentoo <irungentoo@gmail.com> | 2013-07-31 20:27:13 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-07-31 20:27:13 -0400 |
commit | b5b28e43f894a425ddaaa35471f3ac39308d341f (patch) | |
tree | 4f54314e66b32a666f8565ddc1474eb86dcb153d /core | |
parent | bf17d6eb2ec7e7b6834c3afaecd8307724ba065d (diff) | |
parent | 7417dfe21646956aca7861fe79c1b4d207b12443 (diff) |
Merge branch 'master' of https://github.com/Astonex/ProjectTox-Core into Astonex-master
Conflicts:
testing/nTox_win32.c
Diffstat (limited to 'core')
-rw-r--r-- | core/Messenger.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/Messenger.c b/core/Messenger.c index 872d7407..eb59b81a 100644 --- a/core/Messenger.c +++ b/core/Messenger.c | |||
@@ -166,11 +166,13 @@ int m_delfriend(int friendnumber) | |||
166 | free(friendlist[friendnumber].userstatus); | 166 | free(friendlist[friendnumber].userstatus); |
167 | memset(&friendlist[friendnumber], 0, sizeof(Friend)); | 167 | memset(&friendlist[friendnumber], 0, sizeof(Friend)); |
168 | uint32_t i; | 168 | uint32_t i; |
169 | |||
169 | for (i = numfriends; i != 0; --i) { | 170 | for (i = numfriends; i != 0; --i) { |
170 | if (friendlist[i-1].status != 0) | 171 | if (friendlist[i-1].status != 0) |
171 | break; | 172 | break; |
172 | } | 173 | } |
173 | numfriends = i; | 174 | numfriends = i; |
175 | |||
174 | return 0; | 176 | return 0; |
175 | } | 177 | } |
176 | 178 | ||