X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=9b7306b794668b0b75831306a0a3eeacc9f20625;hp=cbf2bceff27908a164128ce27328459b4e5cfadf;hb=d39829a1f4d1e656561e05bcd9c4d43d9e9a5579;hpb=bd337b98fea4ce3f2073bf83394a3e6e3dd9cf71

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index cbf2bceff..9b7306b79 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1553,7 +1553,7 @@ int cmd_stop_trace(struct ltt_session *session)
 	session->enabled = 0;
 
 	/* Kernel tracer */
-	if (ksession) {
+	if (ksession && ksession->started) {
 		DBG("Stop kernel tracing");
 
 		/* Flush metadata if exist */
@@ -1583,7 +1583,7 @@ int cmd_stop_trace(struct ltt_session *session)
 		ksession->started = 0;
 	}
 
-	if (usess) {
+	if (usess && usess->start_trace) {
 		usess->start_trace = 0;
 
 		ret = ust_app_stop_trace_all(usess);