X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fdispatch.c;h=ab6c34846bf315243942ef0afce7b7914bfd0550;hb=28dc0326d832142a7b5fe5e31d4ebb5d8c5d745a;hp=22380fcdd58d4f1cdc878be9096ad8bf93a05db5;hpb=412d7227e69ec845e44c49082a417f9454d9b55d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/dispatch.c b/src/bin/lttng-sessiond/dispatch.c
index 22380fcdd..ab6c34846 100644
--- a/src/bin/lttng-sessiond/dispatch.c
+++ b/src/bin/lttng-sessiond/dispatch.c
@@ -67,7 +67,8 @@ static void update_ust_app(int app_sock)
 			continue;
 		}
 		session_lock(sess);
-		if (!sess->active || !sess->ust_session) {
+		if (!sess->active || !sess->ust_session ||
+				!sess->ust_session->active) {
 			goto unlock_session;
 		}
 
@@ -289,7 +290,7 @@ static void *thread_dispatch_ust_registration(void *data)
 					ust_cmd->sock, ust_cmd->reg_msg.name,
 					ust_cmd->reg_msg.major, ust_cmd->reg_msg.minor);
 
-			if (ust_cmd->reg_msg.type == USTCTL_SOCKET_CMD) {
+			if (ust_cmd->reg_msg.type == LTTNG_UST_CTL_SOCKET_CMD) {
 				wait_node = zmalloc(sizeof(*wait_node));
 				if (!wait_node) {
 					PERROR("zmalloc wait_node dispatch");