Merge branch 'master' of https://github.com/Astonex/ProjectTox-Core into Astonex-master

Conflicts:
	testing/nTox_win32.c

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)
     free(friendlist[friendnumber].userstatus);
     memset(&friendlist[friendnumber], 0, sizeof(Friend));
     uint32_t i;
+
     for (i = numfriends; i != 0; --i) {
         if (friendlist[i-1].status != 0)
             break;
     }
     numfriends = i;
+
     return 0;
 }