4 files changed, 14 insertions, 14 deletions

diff --git a/core/Messenger.c b/core/Messenger.c
index 5532c9cc..4e994a15 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -116,8 +116,8 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
         return FAERR_ALREADYSENT;
 
     uint32_t i;
-    for (i = 0; i < numfriends && i < MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */
-        if(friendlist[i].status == NOFRIEND) {
+    for (i = 0; i <= numfriends && i <= MAX_NUM_FRIENDS; ++i)  { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */
+        if (friendlist[i].status == NOFRIEND) {
             DHT_addfriend(client_id);
             friendlist[i].status = FRIEND_ADDED;
             friendlist[i].crypt_connection_id = -1;
@@ -141,7 +141,7 @@ int m_addfriend_norequest(uint8_t * client_id)
     if (getfriend_id(client_id) != -1)
         return -1;
     uint32_t i;
-    for (i = 0; i < numfriends && i < MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */
+    for (i = 0; i <= numfriends && i <= MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */
         if(friendlist[i].status == NOFRIEND) {
             DHT_addfriend(client_id);
             friendlist[i].status = FRIEND_REQUESTED;
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 0518d284..24a78abb 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -138,7 +138,8 @@ int main(int argc, char *argv[])
         if ( file==NULL ){return 1;}
         uint8_t * buffer = malloc(Messenger_size());
         Messenger_save(buffer);
-        fwrite(buffer, 1, Messenger_size(), file);
+        size_t write_result = fwrite(buffer, 1, Messenger_size(), file);
+        if (write_result < Messenger_size()) {return 1;}
         free(buffer);
         fclose(file);
     }  
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c
index dbbd0f6e..007305ad 100644
--- a/testing/nTox_win32.c
+++ b/testing/nTox_win32.c
@@ -86,7 +86,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
     printf(msg);
 }
 
-void print_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t *string, uint16_t length)
+void print_statuschange(int friendnumber, uint8_t *string, uint16_t length)
 {
     char name[MAX_NAME_LENGTH];
     getname(friendnumber, (uint8_t*)name);
@@ -275,7 +275,7 @@ void change_status(int savetofile)
     }
 
     status[i-3] = 0;
-    m_set_userstatus(status, strlen((char*)status));
+    m_set_userstatus(USERSTATUS_KIND_RETAIN, status, strlen((char*)status));
     char numstring[100];
     sprintf(numstring, "\n[i] changed status to %s\n\n", (char*)status);
     printf(numstring);
@@ -407,7 +407,7 @@ int main(int argc, char *argv[])
         while (fgets(line, MAX_USERSTATUS_LENGTH, status_file) != NULL) {
             sscanf(line, "%s", (char*)status);
         }
-        m_set_userstatus(status, strlen((char*)status)+1);
+        m_set_userstatus(USERSTATUS_KIND_RETAIN, status, strlen((char*)status)+1);
         statusloaded = 1;
         printf("%s\n", status);
         fclose(status_file);
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 1ba8b6c9..8de76244 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -249,6 +249,7 @@ static void load_data(char *path)
 static void draw_bar()
 {
   static int odd = 0;
+  int blinkrate = 30;
 
   attron(COLOR_PAIR(4));
   mvhline(LINES - 2, 0, '_', COLS);
@@ -266,14 +267,13 @@ static void draw_bar()
       if (i == active_window)
         attron(A_BOLD);
 
-      odd = (odd+1) % 10;
-      if (windows[i].blink && (odd < 5)) {
+      odd = (odd+1) % blinkrate;
+      if (windows[i].blink && (odd < (blinkrate/2))) {
         attron(COLOR_PAIR(3));
       }
-
       printw(" %s", windows[i].title);
-      if (windows[i].blink && (odd < 5)) {
-        attron(COLOR_PAIR(3));
+      if (windows[i].blink && (odd < (blinkrate/2))) {
+        attroff(COLOR_PAIR(3));
       }
       if (i == active_window) {
         attroff(A_BOLD);
@@ -375,9 +375,8 @@ int main(int argc, char *argv[])
     ch = getch();
     if (ch == '\t' || ch == KEY_BTAB)
       set_active_window(ch);
-    else if (ch != ERR) {
+    else if (ch != ERR)
       a->onKey(a, ch);
-    }
   }
   return 0;
 }