diff --git a/app/main.ts b/app/main.ts index 1f8a272896..9b6982ac47 100644 --- a/app/main.ts +++ b/app/main.ts @@ -119,29 +119,15 @@ const development = const enableCI = config.get('enableCI'); -const sql = new MainSQL(); -const heicConverter = getHeicConverter(); - const preventDisplaySleepService = new PreventDisplaySleepService( powerSaveBlocker ); -let systemTrayService: SystemTrayService | undefined; -const systemTraySettingCache = new SystemTraySettingCache( - sql, - ephemeralConfig, - process.argv, - app.getVersion() -); - const challengeHandler = new ChallengeMainHandler(); const nativeThemeNotifier = new NativeThemeNotifier(); nativeThemeNotifier.initialize(); -let sqlInitTimeStart = 0; -let sqlInitTimeEnd = 0; - let appStartInitialSpellcheckSetting = true; const defaultWebPrefs = { @@ -151,25 +137,6 @@ const defaultWebPrefs = { !isProduction(app.getVersion()), }; -async function getSpellCheckSetting() { - const fastValue = ephemeralConfig.get('spell-check'); - if (fastValue !== undefined) { - getLogger().info('got fast spellcheck setting', fastValue); - return fastValue; - } - - const json = await sql.sqlCall('getItemById', ['spell-check']); - - // Default to `true` if setting doesn't exist yet - const slowValue = json ? json.value : true; - - ephemeralConfig.set('spell-check', slowValue); - - getLogger().info('got slow spellcheck setting', slowValue); - - return slowValue; -} - function showWindow() { if (!mainWindow) { return; @@ -231,6 +198,39 @@ if (!process.mas) { } /* eslint-enable no-console */ +let sqlInitTimeStart = 0; +let sqlInitTimeEnd = 0; + +const sql = new MainSQL(); +const heicConverter = getHeicConverter(); + +async function getSpellCheckSetting() { + const fastValue = ephemeralConfig.get('spell-check'); + if (fastValue !== undefined) { + getLogger().info('got fast spellcheck setting', fastValue); + return fastValue; + } + + const json = await sql.sqlCall('getItemById', ['spell-check']); + + // Default to `true` if setting doesn't exist yet + const slowValue = json ? json.value : true; + + ephemeralConfig.set('spell-check', slowValue); + + getLogger().info('got slow spellcheck setting', slowValue); + + return slowValue; +} + +let systemTrayService: SystemTrayService | undefined; +const systemTraySettingCache = new SystemTraySettingCache( + sql, + ephemeralConfig, + process.argv, + app.getVersion() +); + const windowFromUserConfig = userConfig.get('window'); const windowFromEphemeral = ephemeralConfig.get('window'); export const windowConfigSchema = z.object({