Merge branch 'master' of git://git.lttng.org/lttng-tools

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 16dd9ab5dd10d58365f1b04558edf37afcccb71a..5755363c878d6e9c6663763b123c8839a9dc82ac 100644 (file)
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -1057,6 +1057,12 @@ static void *thread_manage_apps(void *data)
                                                goto error;
                                        }
 
+                                       /*
+                                        * Add channel(s) and event(s) to newly registered apps
+                                        * from lttng global UST domain.
+                                        */
+                                       update_ust_app(ust_cmd.sock);
+
                                        ret = ustctl_register_done(ust_cmd.sock);
                                        if (ret < 0) {
                                                /*
@@ -1078,11 +1084,6 @@ static void *thread_manage_apps(void *data)
                                                                ust_cmd.sock);
                                        }
 
-                                       /*
-                                        * Add channel(s) and event(s) to newly registered apps
-                                        * from lttng global UST domain.
-                                        */
-                                       update_ust_app(ust_cmd.sock);
                                        break;
                                }
                        } else {