mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Initialize locale earlier to avoid races

Browse source
This commit is contained in:
Fedor Indutny 2021-11-29 19:04:14 +01:00 • committed by GitHub
parent 29b4148889
commit 599c7afe8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/main.ts
View file

@ -1371,6 +1371,12 @@ app.on('ready', async () => {
logger = await logging.initialize(getMainWindow); logger = await logging.initialize(getMainWindow);
if (!locale) {
const appLocale =
getEnvironment() === Environment.Test ? 'en' : app.getLocale();
locale = loadLocale({ appLocale, logger });
}
sqlInitPromise = initializeSQL(userDataPath); sqlInitPromise = initializeSQL(userDataPath);
const startTime = Date.now(); 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); GlobalErrors.updateLocale(locale.messages);
// If the sql initialization takes more than three seconds to complete, we // If the sql initialization takes more than three seconds to complete, we