1 files changed, 12 insertions, 0 deletions

diff --git a/src/common/logging.c b/src/common/logging.c
index 677c4783..e5ddcea8 100644
--- a/src/common/logging.c
+++ b/src/common/logging.c
@@ -32,6 +32,8 @@
 
 static GtkWidget *infoWindowTextView;
 
+static int is_shutdown;
+
 static void
 init ()
 {
@@ -127,6 +129,8 @@ GNUNET_GTK_add_log_entry (const char *txt, ...)
   va_list args;
   gchar *note;
 
+  if (is_shutdown)
+    return;
   va_start (args, txt);
   note = g_strdup_vprintf (txt, args);
   va_end (args);
@@ -139,9 +143,17 @@ static void
 ge_gtk_log_handler (void *ctx,
                     GNUNET_GE_KIND kind, const char *date, const char *msg)
 {
+  if (is_shutdown)
+    return;
   GNUNET_GTK_show_info_message ("%s: %s", date, msg);
 }
 
+void 
+GNUNET_GTK_shutdown_logger()
+{
+  is_shutdown = GNUNET_YES;
+}
+
 struct GNUNET_GE_Context *
 GNUNET_GTK_create_gtk_logger (GNUNET_GE_KIND mask)
 {