X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=262f48b8ab3b0ffc717814e9ec80e3477ee2df40;hp=54859c8dc302883eccb9dc3c53563ab4eda7f89c;hb=48c4f28cde63c862229c41179e6fac606cdf41d4;hpb=a5a6aff336b0f6bddf87b972830f47b798400b53

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 54859c8dc..262f48b8a 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -2772,8 +2772,11 @@ static int cmd_start_trace(struct ltt_session *session)
 	ksession = session->kernel_session;
 	usess = session->ust_session;
 
-	if (session->enabled)
-		return LTTCOMM_UST_START_FAIL;
+	if (session->enabled) {
+		ret = LTTCOMM_UST_START_FAIL;
+		goto error;
+	}
+
 	session->enabled = 1;
 
 	/* Kernel tracing */
@@ -2861,8 +2864,11 @@ static int cmd_stop_trace(struct ltt_session *session)
 	ksession = session->kernel_session;
 	usess = session->ust_session;
 
-	if (!session->enabled)
-		return LTTCOMM_UST_START_FAIL;
+	if (!session->enabled) {
+		ret = LTTCOMM_UST_START_FAIL;
+		goto error;
+	}
+
 	session->enabled = 0;
 
 	/* Kernel tracer */
@@ -2994,7 +3000,7 @@ static int cmd_register_consumer(struct ltt_session *session, int domain,
 	switch (domain) {
 	case LTTNG_DOMAIN_KERNEL:
 		/* Can't register a consumer if there is already one */
-		if (session->kernel_session->consumer_fd != 0) {
+		if (session->kernel_session->consumer_fds_sent != 0) {
 			ret = LTTCOMM_KERN_CONSUMER_FAIL;
 			goto error;
 		}