-fix segv on shutdown

1 files changed, 17 insertions, 7 deletions

diff --git a/src/main/gnunet-gtk.c b/src/main/gnunet-gtk.c
index f28e5749..3cc29b0d 100644
--- a/src/main/gnunet-gtk.c
+++ b/src/main/gnunet-gtk.c
@@ -74,6 +74,11 @@ struct Plug
    */
   GNUNET_SCHEDULER_TaskIdentifier restart_task;
 
+  /**
+   * ID of the signal associated with the window.
+   */
+  gulong sig_id;
+
 };
 
 
@@ -145,6 +150,8 @@ cleanup_task (void *cls,
       GNUNET_SCHEDULER_cancel (p->restart_task);
       p->restart_task = GNUNET_SCHEDULER_NO_TASK;
     }
+    g_signal_handler_disconnect (p->s,
+                                 p->sig_id);
     GNUNET_CONTAINER_DLL_remove (p_head,
                                  p_tail,
                                  p);
@@ -230,9 +237,12 @@ handle_remove (GtkSocket *sock,
 {
   struct Plug *p = userdata;
 
-  (void) GNUNET_OS_process_kill (p->proc, SIGTERM);
-  GNUNET_OS_process_destroy (p->proc);
-  p->proc = NULL;
+  if (NULL != p->proc)
+  {
+    (void) GNUNET_OS_process_kill (p->proc, SIGTERM);
+    GNUNET_OS_process_destroy (p->proc);
+    p->proc = NULL;
+  }
   p->backoff = GNUNET_TIME_STD_BACKOFF (p->backoff);
   p->restart_task = GNUNET_SCHEDULER_add_delayed (p->backoff,
                                                   &restart_process,
@@ -264,10 +274,10 @@ plug (const char *container,
   gtk_container_add (v, p->s);
   p->binary = binary;
   p->env_var = env_var;
-  g_signal_connect (p->s,
-                    "plug-removed",
-                    G_CALLBACK (handle_remove),
-                    p);
+  p->sig_id = g_signal_connect (p->s,
+                                "plug-removed",
+                                G_CALLBACK (handle_remove),
+                                p);
   start_process (p);
   gtk_widget_show (p->s);
   GNUNET_CONTAINER_DLL_insert (p_head,