X-Git-Url: http://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=a1af9c53526367018c774447837e352f2f349353;hp=c318f833c87f6f2930b1090b384f31cea3d62013;hb=513676343b23fd9743291679cff46756238bf360;hpb=fbc9f37df245d544a7705ba576297df791220b44

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index c318f833c..a1af9c535 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -2598,13 +2598,7 @@ int handle_notification_thread_command_unregister_trigger(
 
 		cds_list_for_each_entry_safe(trigger_element, tmp,
 				&trigger_list->list, node) {
-			const struct lttng_condition *current_condition =
-					lttng_trigger_get_const_condition(
-						trigger_element->trigger);
-
-			assert(current_condition);
-			if (!lttng_condition_is_equal(condition,
-					current_condition)) {
+			if (!lttng_trigger_is_equal(trigger, trigger_element->trigger)) {
 				continue;
 			}
 
@@ -2615,17 +2609,19 @@ int handle_notification_thread_command_unregister_trigger(
 		}
 	}
 
-	/*
-	 * Remove and release the client list from
-	 * notification_trigger_clients_ht.
-	 */
-	client_list = get_client_list_from_condition(state, condition);
-	assert(client_list);
+	if (is_trigger_action_notify(trigger)) {
+		/*
+		 * Remove and release the client list from
+		 * notification_trigger_clients_ht.
+		 */
+		client_list = get_client_list_from_condition(state, condition);
+		assert(client_list);
 
-	/* Put new reference and the hashtable's reference. */
-	notification_client_list_put(client_list);
-	notification_client_list_put(client_list);
-	client_list = NULL;
+		/* Put new reference and the hashtable's reference. */
+		notification_client_list_put(client_list);
+		notification_client_list_put(client_list);
+		client_list = NULL;
+	}
 
 	/* Remove trigger from triggers_ht. */
 	trigger_ht_element = caa_container_of(triggers_ht_node,