1 files changed, 28 insertions, 20 deletions

diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index 42a2b89d..cc0ab120 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -27,11 +27,11 @@
 
 #define DEBUG_EVENTLOOP GNUNET_NO
 
-/** 
+/**
  * Initial size of our poll array cache.
  *
  * TODO: get some statistics, find the maximum number of fds ever
- * polled during normal gnunet-gtk operation, and set this to that number. 
+ * polled during normal gnunet-gtk operation, and set this to that number.
  */
 #define INITIAL_POLL_ARRAY_SIZE 30
 
@@ -178,8 +178,12 @@ void
 GNUNET_GTK_main_loop_quit (struct GNUNET_GTK_MainLoop *ml)
 {
   g_main_loop_quit (ml->gml);
-  GNUNET_SCHEDULER_cancel (ml->dummy_task);
-  ml->dummy_task = GNUNET_SCHEDULER_NO_TASK;
+  ml->gml = NULL;
+  if (GNUNET_SCHEDULER_NO_TASK != ml->dummy_task)
+  {
+    GNUNET_SCHEDULER_cancel (ml->dummy_task);
+    ml->dummy_task = GNUNET_SCHEDULER_NO_TASK;
+  }
 }
 
 
@@ -546,18 +550,20 @@ gnunet_gtk_select (void *cls, struct GNUNET_NETWORK_FDSet *rfds,
 #endif
 
   /* combine with Gtk events */
-  g_main_context_prepare (ml->gmc, &max_priority);
-  while (1)
+  if (NULL != ml->gmc)
   {
-    need_gfds =
-        g_main_context_query (ml->gmc, max_priority, &delay,
-                              &ml->cached_poll_array[fd_counter],
-                              ml->cached_poll_array_size - fd_counter);
-    if (ml->cached_poll_array_size >= need_gfds + fd_counter)
-      break;
-    resize_cached_poll_array (ml, fd_counter + need_gfds);
+    g_main_context_prepare (ml->gmc, &max_priority);
+    while (1)
+    {
+      need_gfds =
+          g_main_context_query (ml->gmc, max_priority, &delay,
+                                &ml->cached_poll_array[fd_counter],
+                                ml->cached_poll_array_size - fd_counter);
+      if (ml->cached_poll_array_size >= need_gfds + fd_counter)
+        break;
+      resize_cached_poll_array (ml, fd_counter + need_gfds);
+    }
   }
-
   if (timeout.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
   {
     if (delay >= 0)
@@ -597,12 +603,14 @@ gnunet_gtk_select (void *cls, struct GNUNET_NETWORK_FDSet *rfds,
    * from within a task (currently we're not in a task, but in a select() call, remember)
    * Startup reason is used to pass the scheduler sanity check.
    */
-  if (TRUE ==
-      g_main_context_check (ml->gmc, max_priority,
-                            &ml->cached_poll_array[fd_counter], need_gfds))
-    GNUNET_SCHEDULER_add_continuation (&dispatch_gtk_task, ml,
-                                       GNUNET_SCHEDULER_REASON_STARTUP);
-
+  if (NULL != ml->gmc)
+  {
+    if (TRUE ==
+        g_main_context_check (ml->gmc, max_priority,
+                              &ml->cached_poll_array[fd_counter], need_gfds))
+      GNUNET_SCHEDULER_add_continuation (&dispatch_gtk_task, ml,
+                                         GNUNET_SCHEDULER_REASON_STARTUP);
+  }
   /* Now map back GNUnet scheduler events ... */
 #if !WINDOWS
   if (NULL != rfds)