Merge pull request #163 from choigawoon/fix/exec-order

Fix/trivials
jooy2 · Nov 10, 2023 · e9e9f87 · e9e9f87
2 parents 94250ae + 7015667
commit e9e9f87
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/MainRunner.ts b/src/main/MainRunner.ts
@@ -40,15 +40,15 @@ export const createMainWindow = async (mainWindow: BrowserWindow): Promise<Brows
     mainWindow.setAlwaysOnTop(false)
   })
 
+  // Initialize IPC Communication
+  IPCs.initialize(mainWindow)
+
   if (Constants.IS_DEV_ENV) {
     await mainWindow.loadURL(Constants.APP_INDEX_URL_DEV)
   } else {
     await mainWindow.loadFile(Constants.APP_INDEX_URL_PROD)
   }
 
-  // Initialize IPC Communication
-  IPCs.initialize(mainWindow)
-
   return mainWindow
 }
 

diff --git a/src/main/index.ts b/src/main/index.ts
@@ -12,12 +12,12 @@ app.on('ready', async () => {
   }
   macOSDisableDefaultMenuItem()
 
-  mainWindow = createMainWindow(mainWindow)
+  mainWindow = await createMainWindow(mainWindow)
 })
 
-app.on('activate', () => {
+app.on('activate', async () => {
   if (!mainWindow) {
-    mainWindow = createMainWindow(mainWindow)
+    mainWindow = await createMainWindow(mainWindow)
   }
 })