1 files changed, 13 insertions, 2 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 0a3c52ee..b147e698 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1885,7 +1885,7 @@ static int friend_already_added(const uint8_t *real_pk, void *data)
 }
 
 /* Run this at startup. */
-Messenger *new_messenger(Logger *log, Messenger_Options *options, unsigned int *error)
+Messenger *new_messenger(Messenger_Options *options, unsigned int *error)
 {
     Messenger *m = (Messenger *)calloc(1, sizeof(Messenger));
 
@@ -1893,10 +1893,20 @@ Messenger *new_messenger(Logger *log, Messenger_Options *options, unsigned int *
         *error = MESSENGER_ERROR_OTHER;
     }
 
-    if (! m) {
+    if (!m) {
         return NULL;
     }
 
+    Logger *log = NULL;
+
+    if (options && options->log_callback) {
+        log = logger_new();
+
+        if (log != NULL) {
+            logger_callback_log(log, options->log_callback, m, options->log_user_data);
+        }
+    }
+
     m->log = log;
 
     unsigned int net_err = 0;
@@ -2012,6 +2022,7 @@ void kill_messenger(Messenger *m)
         clear_receipts(m, i);
     }
 
+    logger_kill(m->log);
     free(m->friendlist);
     free(m);
 }