src/bootstrap.c

@@ -601,7 +601,6 @@ int load_DHT_nodeslist(void)
     Nodes.count = 2;
 
 #if 0
-
     if (thread_data.active) {
         return -1;
     }
@@ -624,7 +623,6 @@ int load_DHT_nodeslist(void)
         thread_data.active = false;
         return -5;
     }
-
 #endif
 
     return 0;

src/groupchats.c

@@ -991,9 +991,7 @@ static void groupchat_onGroupPeerJoin(ToxWindow *self, Tox *m, uint32_t groupnum
             ++chat->max_idx;
         }
 
-        if (timed_out(chat->time_connected, 60)
+        if (timed_out(chat->time_connected, 60) && user_settings->show_group_connection_msg == SHOW_GROUP_CONNECTION_MSG_ON) {   /* ignore join messages when we first connect to the group */
-                && user_settings->show_group_connection_msg ==
-                SHOW_GROUP_CONNECTION_MSG_ON) {   /* ignore join messages when we first connect to the group */
             line_info_add(self, true, peer->name, NULL, CONNECTION, 0, GREEN, "has joined the room");
 
             write_to_log("has joined the room", peer->name, self->chatwin->log, true);
@@ -1035,10 +1033,7 @@ void groupchat_onGroupPeerExit(ToxWindow *self, Tox *m, uint32_t groupnumber, ui
             snprintf(log_str, sizeof(log_str), "[%s]", exit_string);
         }
 
-        if (user_settings->show_group_connection_msg == SHOW_GROUP_CONNECTION_MSG_ON) {
         write_to_log(log_str, name, self->chatwin->log, true);
-        }
-
         sound_notify(self, silent, NT_WNDALERT_2, NULL);
     }
 

src/toxic.c

@@ -269,20 +269,13 @@ void cb_toxcore_logger(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t l
     }
 
     struct timeval tv;
-
     gettimeofday(&tv, NULL);
-
     struct tm tmp;
-
     gmtime_r(&tv.tv_sec, &tmp);
-
     char timestamp[200];
-
     strftime(timestamp, sizeof(timestamp), "%F %T", &tmp);
 
-    fprintf(fp, "%c %s.%06ld %s:%u(%s) - %s\n", tox_log_level_show(level)[0], timestamp, tv.tv_usec, file, line, func,
+    fprintf(fp, "%c %s.%06ld %s:%u(%s) - %s\n", tox_log_level_show(level)[0], timestamp, tv.tv_usec, file, line, func, message);
-            message);
-
     fflush(fp);
 }