1 files changed, 20 insertions, 2 deletions

diff --git a/src/gnunet_chat_context_intern.c b/src/gnunet_chat_context_intern.c
index 79c09a2..af1e2cc 100644
--- a/src/gnunet_chat_context_intern.c
+++ b/src/gnunet_chat_context_intern.c
@@ -70,6 +70,10 @@ cont_context_commit_records (void *cls,
 {
   struct GNUNET_CHAT_Context *context = cls;
 
+  GNUNET_assert(context);
+
+  context->query_commit = NULL;
+
   if ((!emsg) || (!(context->handle)))
     return;
 
@@ -86,6 +90,10 @@ error_context_open_records (void *cls)
 {
   struct GNUNET_CHAT_Context *context = cls;
 
+  GNUNET_assert(context);
+
+  context->query_open = NULL;
+
   if (!(context->handle))
     return;
 
@@ -108,6 +116,8 @@ monitor_context_open_records (void *cls,
 
   GNUNET_assert((context) && (context->handle));
 
+  context->query_open = NULL;
+
   const struct GNUNET_HashCode *hash = GNUNET_MESSENGER_room_get_key(
       context->room
   );
@@ -172,7 +182,10 @@ monitor_context_open_records (void *cls,
     count++;
   }
 
-  GNUNET_NAMESTORE_records_commit(
+  if (context->query_commit)
+    GNUNET_NAMESTORE_cancel(context->query_commit);
+
+  context->query_commit = GNUNET_NAMESTORE_records_commit(
       context->handle->namestore,
       zone,
       label,
@@ -194,7 +207,12 @@ monitor_context_delete_records (void *cls,
 
   GNUNET_assert((context) && (context->handle));
 
-  GNUNET_NAMESTORE_records_commit(
+  context->query_open = NULL;
+
+  if (context->query_commit)
+    GNUNET_NAMESTORE_cancel(context->query_commit);
+
+  context->query_commit = GNUNET_NAMESTORE_records_commit(
       context->handle->namestore,
       zone,
       label,