X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_trigger.c;h=8fb79d3786c577842475ea9724f92293ec591800;hp=583dd1903400dccca12d89ec7ee92cad380a7ac7;hb=1004b7191b421c7c07acf964d0110d93bb022699;hpb=8310270a50784aced2af5b21ab23bc7bd9dee47f

diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index 583dd1903..8fb79d378 100644
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -18,6 +18,7 @@
 #include "common/mi-lttng.h"
 #include "common/string-utils/string-utils.h"
 #include "common/utils.h"
+#include <lttng/domain-internal.h>
 /* For lttng_event_rule_type_str(). */
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/lttng.h>
@@ -2407,18 +2408,15 @@ int cmd_add_trigger(int argc, const char **argv)
 			goto error;
 		}
 	} else {
-		if (!name) {
-			const char *returned_trigger_name;
-			const enum lttng_trigger_status trigger_status =
-					lttng_trigger_get_name(trigger,
-							&returned_trigger_name);
+		const char *returned_trigger_name;
+		const enum lttng_trigger_status trigger_status =
+				lttng_trigger_get_name(trigger,
+						&returned_trigger_name);
 
-			if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
-				WARN("Failed to retrieve the name generated for the added trigger.");
-			} else {
-				MSG("Added trigger '%s'.",
-						returned_trigger_name);
-			}
+		if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
+			WARN("Failed to retrieve the added trigger's name.");
+		} else {
+			MSG("Added trigger `%s`.", returned_trigger_name);
 		}
 	}
 
@@ -2431,7 +2429,7 @@ error:
 
 end:
 	/* Mi closing. */
-	if (lttng_opt_mi) {
+	if (lttng_opt_mi && mi_writer) {
 		int mi_ret;
 
 		/* Close output element. */