From 599c7afe8b91ec5aa24ff022e8bd5076f2bc2b85 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Mon, 29 Nov 2021 19:04:14 +0100
Subject: [PATCH] Initialize `locale` earlier to avoid races

---
 app/main.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/main.ts b/app/main.ts
index 1c0abc9c62..ef91f41218 100644
--- a/app/main.ts
+++ b/app/main.ts
@@ -1371,6 +1371,12 @@ app.on('ready', async () => {
 
   logger = await logging.initialize(getMainWindow);
 
+  if (!locale) {
+    const appLocale =
+      getEnvironment() === Environment.Test ? 'en' : app.getLocale();
+    locale = loadLocale({ appLocale, logger });
+  }
+
   sqlInitPromise = initializeSQL(userDataPath);
 
   const startTime = Date.now();
@@ -1448,12 +1454,6 @@ app.on('ready', async () => {
     );
   }
 
-  if (!locale) {
-    const appLocale =
-      getEnvironment() === Environment.Test ? 'en' : app.getLocale();
-    locale = loadLocale({ appLocale, logger });
-  }
-
   GlobalErrors.updateLocale(locale.messages);
 
   // If the sql initialization takes more than three seconds to complete, we