move "forceClose" flag to context

vladimiry · Feb 22, 2018 · cb3e5d6 · cb3e5d6
1 parent 8430d7e
commit cb3e5d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/electron/main/index.ts b/src/electron/main/index.ts
@@ -21,7 +21,10 @@ let uiContext: UIContext;
 
 export function initApp(ctx: Context) {
     if (app.makeSingleInstance(activateBrowserWindow)) {
-        app.quit();
+        ctx.forceClose = true;
+        // calling app.exit() instead of app.quit() in order to prevent "Error: Cannot find module ..." error happening
+        // https://github.com/electron/electron/issues/8862
+        app.exit();
     }
 
     app.on("ready", async () => {

diff --git a/src/electron/main/window.ts b/src/electron/main/window.ts
@@ -19,8 +19,7 @@ export async function initBrowserWindow(ctx: Context): Promise<BrowserWindow> {
         show: false,
     };
     const browserWindow = new BrowserWindow(browserWindowConstructorOptions);
-    const appBeforeQuitEventHandler = () => forceClose = true;
-    let forceClose = false;
+    const appBeforeQuitEventHandler = () => ctx.forceClose = true;
 
     app.on("before-quit", appBeforeQuitEventHandler);
 
@@ -36,7 +35,7 @@ export async function initBrowserWindow(ctx: Context): Promise<BrowserWindow> {
     });
     browserWindow.on("closed", () => {
         browserWindow.destroy();
-
+        delete ctx.forceClose;
         app.removeListener("before-quit", appBeforeQuitEventHandler);
 
         // On macOS it is common for applications and their menu bar to stay active until the user quits explicitly with Cmd + Q
@@ -45,7 +44,7 @@ export async function initBrowserWindow(ctx: Context): Promise<BrowserWindow> {
         }
     });
     browserWindow.on("close", (event) => {
-        if (!ctx.configInstance().closeToTray || forceClose) {
+        if (!ctx.configInstance().closeToTray || ctx.forceClose) {
             // allow window closing
             return true;
         }