From 26ca8ccefc92ec0238c20d0bda53059faef1883d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Vay=C3=A1?= <guillermo.vaya@mattermost.com>
Date: Tue, 13 Jul 2021 18:23:05 +0200
Subject: [PATCH] disable gpu before app inits (#1654)

Co-authored-by: = <=>
---
 src/common/config/index.ts |  5 +++--
 src/main/main.ts           | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/common/config/index.ts b/src/common/config/index.ts
index 727bfdfc..f3f3032f 100644
--- a/src/common/config/index.ts
+++ b/src/common/config/index.ts
@@ -35,7 +35,7 @@ import RegistryConfig, {REGISTRY_READ_EVENT} from './RegistryConfig';
 export default class Config extends EventEmitter {
     configFilePath: string;
 
-    registryConfig?: RegistryConfig;
+    registryConfig: RegistryConfig;
 
     combinedData?: CombinedConfig;
     registryConfigData?: Partial<RegistryConfigType>;
@@ -46,11 +46,12 @@ export default class Config extends EventEmitter {
     constructor(configFilePath: string) {
         super();
         this.configFilePath = configFilePath;
+        this.registryConfig = new RegistryConfig();
     }
 
     // separating constructor from init so main can setup event listeners
     init = (): void => {
-        this.registryConfig = new RegistryConfig();
+        this.reload();
         this.registryConfig.once(REGISTRY_READ_EVENT, this.loadRegistry);
         this.registryConfig.init();
     }
diff --git a/src/main/main.ts b/src/main/main.ts
index 9657a480..3371b869 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -157,6 +157,12 @@ async function initializeConfig() {
             config.on('synchronize', handleConfigSynchronize);
             config.on('darkModeChange', handleDarkModeChange);
             handleConfigUpdate(configData);
+
+            // can only call this before the app is ready
+            if (config.enableHardwareAcceleration === false) {
+                app.disableHardwareAcceleration();
+            }
+
             resolve();
         });
         config.init();
@@ -194,11 +200,6 @@ function initializeBeforeAppReady() {
         process.chdir(expectedPath);
     }
 
-    // can only call this before the app is ready
-    if (config.enableHardwareAcceleration === false) {
-        app.disableHardwareAcceleration();
-    }
-
     refreshTrayImages(config.trayIconTheme);
 
     // If there is already an instance, quit this one