1 files changed, 6 insertions, 0 deletions

diff --git a/src/gnunet_chat_handle.c b/src/gnunet_chat_handle.c
index b676cc9..92b4fbe 100644
--- a/src/gnunet_chat_handle.c
+++ b/src/gnunet_chat_handle.c
@@ -38,6 +38,9 @@ handle_create_from_config (const struct GNUNET_CONFIGURATION_Handle* cfg,
   struct GNUNET_CHAT_Handle* handle = GNUNET_new(struct GNUNET_CHAT_Handle);
 
   handle->cfg = cfg;
+  handle->shutdown_hook = GNUNET_SCHEDULER_add_shutdown(
+      on_handle_shutdown, handle
+  );
 
   if ((directory) &&
       (GNUNET_YES == GNUNET_DISK_directory_test(directory, GNUNET_YES)))
@@ -120,6 +123,9 @@ handle_destroy (struct GNUNET_CHAT_Handle* handle)
                 (handle->contexts) &&
                 (handle->files));
 
+  if (handle->shutdown_hook)
+    GNUNET_SCHEDULER_cancel(handle->shutdown_hook);
+
   if (handle->public_key)
     GNUNET_free(handle->public_key);