From 0427a782bef2aeded1a31426598e5afed41c77f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 5 Mar 2019 19:31:01 +0100 Subject: [PATCH] main: Wait for startup completion before running perf script The scripts generally assume a functional shell, so wait until that is the case. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/440 --- js/ui/main.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/js/ui/main.js b/js/ui/main.js index f9556f14d..061303cf3 100644 --- a/js/ui/main.js +++ b/js/ui/main.js @@ -211,13 +211,6 @@ function _initializeUI() { _startDate = new Date(); - let perfModuleName = GLib.getenv("SHELL_PERF_MODULE"); - if (perfModuleName) { - let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT"); - let module = eval('imports.perf.' + perfModuleName + ';'); - Scripting.runPerfScript(module, perfOutput); - } - ExtensionDownloader.init(); ExtensionSystem.init(); @@ -239,6 +232,13 @@ function _initializeUI() { Shell.Global.log_structured('GNOME Shell started at ' + _startDate, ['MESSAGE_ID=' + GNOMESHELL_STARTED_MESSAGE_ID]); } + + let perfModuleName = GLib.getenv("SHELL_PERF_MODULE"); + if (perfModuleName) { + let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT"); + let module = eval('imports.perf.' + perfModuleName + ';'); + Scripting.runPerfScript(module, perfOutput); + } }); }