Merge branch 'dev' into release_candidate

1 files changed, 5 insertions, 3 deletions

diff --git a/launch.py b/launch.py
index 1dbc4c6e..e4c2ce99 100644
--- a/launch.py
+++ b/launch.py
@@ -1,6 +1,5 @@
 from modules import launch_utils

 

-

 args = launch_utils.args

 python = launch_utils.python

 git = launch_utils.git

@@ -26,8 +25,11 @@ start = launch_utils.start
 

 

 def main():

-    if not args.skip_prepare_environment:

-        prepare_environment()

+    launch_utils.startup_timer.record("initial startup")

+

+    with launch_utils.startup_timer.subcategory("prepare environment"):

+        if not args.skip_prepare_environment:

+            prepare_environment()

 

     if args.test_server:

         configure_for_tests()