X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=131e93d0f14646f6b6455816e44af613b26ca12c;hb=13839b2759a1c2bc0e53224ddbfc35824cfbb62e;hp=83ad957fcdb08912e3dd045940609d01c5e4efda;hpb=fc4b93fa8aa36b19caad0f8dc4a6a3237fcc36bf;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 83ad957fc..131e93d0f 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -30,8 +30,8 @@
 #include <lttng/trigger/trigger-internal.h>
 #include <lttng/condition/condition.h>
 #include <lttng/condition/condition-internal.h>
-#include <lttng/condition/event-rule.h>
-#include <lttng/condition/event-rule-internal.h>
+#include <lttng/condition/on-event.h>
+#include <lttng/condition/on-event-internal.h>
 #include <lttng/event-rule/event-rule.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/action/action.h>
@@ -4306,7 +4306,7 @@ static enum lttng_error_code trigger_modifies_event_notifier(
 	}
 
 	*adds_event_notifier = lttng_condition_get_type(condition) ==
-			LTTNG_CONDITION_TYPE_EVENT_RULE_HIT;
+			LTTNG_CONDITION_TYPE_ON_EVENT;
 end:
 	return ret_code;
 }
@@ -4521,6 +4521,7 @@ enum lttng_error_code cmd_unregister_trigger(const struct lttng_credentials *cmd
 	if (ret_code != LTTNG_OK) {
 		DBG("Failed to unregister trigger from notification thread: trigger name = '%s', trigger owner uid = %d, error code = %d",
 				trigger_name, (int) trigger_owner, ret_code);
+		goto end;
 	}
 
 	/*