Merge branch 'master' of ssh://gnunet.org/gnunet

2 files changed, 5 insertions, 3 deletions

diff --git a/src/multicast/test_multicast.conf b/src/multicast/test_multicast.conf
index 822a3b3c0..1bfde1d36 100644
--- a/src/multicast/test_multicast.conf
+++ b/src/multicast/test_multicast.conf
@@ -6,7 +6,7 @@ OVERLAY_TOPOLOGY = STAR
 GLOBAL_POSTFIX=-L ERROR
 
 [hostlist]
-#SERVERS = http://localhost:8080/
+SERVERS = http://localhost:8080/
 
 [multicast]
 #PREFIX = tmux split-window -v gdb -x ./cmd.gdb  --args
diff --git a/src/set/set_api.c b/src/set/set_api.c
index 27e2ccf04..1d0d00b44 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -497,7 +497,8 @@ set_operation_destroy (struct GNUNET_SET_OperationHandle *oh)
                                  oh);
     h_assoc = GNUNET_MQ_assoc_remove (set->mq,
                                       oh->request_id);
-    GNUNET_assert ((NULL == h_assoc) || (h_assoc == oh));
+    GNUNET_assert ( (NULL == h_assoc) ||
+                    (h_assoc == oh) );
   }
   GNUNET_free (oh);
 }
@@ -556,7 +557,8 @@ handle_client_set_error (void *cls,
        error);
   while (NULL != set->ops_head)
   {
-    if (NULL != set->ops_head->result_cb)
+    if ( (NULL != set->ops_head->result_cb) &&
+         (GNUNET_NO == set->destroy_requested) )
       set->ops_head->result_cb (set->ops_head->result_cls,
                                 NULL,
                                 0,