Fix problem of prevent window close will prevented app.quit

jhen0409 · Sep 26, 2017 · a2469af · a2469af
1 parent c696a11
commit a2469af
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/electron/main.js b/electron/main.js
@@ -52,6 +52,15 @@ app.on('window-all-closed', () => {
   }
 });
 
+app.on('before-quit', async event => {
+  event.preventDefault();
+  for (const win of BrowserWindow.getAllWindows()) {
+    win.removeAllListeners('close');
+    await win.close();
+  }
+  process.exit();
+});
+
 app.on('ready', async () => {
   await installExtensions();
 

diff --git a/electron/window.js b/electron/window.js
@@ -78,13 +78,15 @@ export const createWindow = ({ iconPath, isPortSettingRequired }) => {
     removeUnecessaryTabs(win);
   });
   win.on('focus', () => onFocus(win));
-  win.on('close', event => {
-    event.preventDefault();
+  win.close = async () => {
     store.set('winBounds', win.getBounds());
     win.webContents.getZoomLevel(level => store.set('zoomLevel', level));
-    executeJavaScript(win, 'window.beforeWindowClose()').then(() => {
-      win.destroy();
-    });
+    await executeJavaScript(win, 'window.beforeWindowClose && window.beforeWindowClose()');
+    win.destroy();
+  };
+  win.on('close', event => {
+    event.preventDefault();
+    win.close();
   });
   // Try to fix https://github.com/jhen0409/react-native-debugger/issues/81
   // but really not sure because the method works fine on most machines