1 files changed, 16 insertions, 3 deletions
diff --git a/gtk/gui.c b/gtk/gui.c
index 59847214b..832d79e6e 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -515,6 +515,17 @@ static void nsgtk_check_homedir(void)
 }
 
 /**
+ * Ensures output logging stream is correctly configured
+ */
+static bool nslog_stream_configure(FILE *fptr)
+{
+        /* set log stream to be non-buffering */
+	setbuf(fptr, NULL);
+
+	return true;
+}
+
+/**
  * Main entry point from OS.
  */
 int main(int argc, char** argv)
@@ -529,12 +540,14 @@ int main(int argc, char** argv)
 
 	gtk_init(&argc, &argv);
 	
-        /* set standard error to be non-buffering */
-	setbuf(stderr, NULL);
-
 	options = filepath_find(respaths, "Choices");
 	messages = filepath_find(respaths, "Messages");
 
+	/* initialise logging. Not fatal if it fails but not much we
+	 * can do about it either.
+	 */
+	nslog_init(nslog_stream_configure, &argc, argv);
+
 	netsurf_init(&argc, &argv, options, messages);
 
 	free(messages);