Make sure scheduler is shut down on exit

1 files changed, 11 insertions, 1 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index b88aba49..a71c4116 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -205,7 +205,8 @@ static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {  
   GNUNET_GTK_tray_icon_destroy ();
-  GNUNET_GTK_main_loop_quit (ml);
+  if (NULL != ml)
+    GNUNET_GTK_main_loop_quit (ml);
   ml = NULL;
   if (fs != NULL)
   {
@@ -245,6 +246,15 @@ GNUNET_FS_GTK_delete_event_cb (GtkWidget *object,
 {
   struct GNUNET_GTK_MainWindowContext *main_context = user_data;
 
+  /* GNUNET_FS_GTK_delete_event_cb will eventually be called if we shut down
+   * the scheduler, because shutting it down will make GTK delete the main
+   * window. On the other hand, deleting the main window first (clicking on X
+   * button) will not trigger scheduler shutdown, unlike
+   * GNUNET_FS_GTK_menu_quit_activate_cb(). So we shut it down here again,
+   * just to be sure it is dead (if it isn't, application will hang up).
+   */
+  GNUNET_SCHEDULER_shutdown ();
+
   GNUNET_GTK_tray_icon_destroy ();
   GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
                                       &shutdown_task, NULL);