Fix process not exiting in certain circumstances (#12)

jgierer12 · Mar 21, 2019 · 2cc74de · 2cc74de
1 parent 80ffbee
commit 2cc74de
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/index.js b/src/index.js
@@ -13,10 +13,6 @@ const showWindow = () => {
   window && window.show && window.show();
 };
 
-const exitWindow = () => {
-  window = null;
-};
-
 const createWindow = () => {
   const windowState = getWindowState({
     defaultWidth: 1200,
@@ -52,11 +48,13 @@ const createWindow = () => {
     shell.openExternal(url);
   });
 
-  window.on(`closed`, exitWindow);
-  process.on(`beforeExit`, exitWindow);
+  window.on(`closed`, () => {
+    window = null;
+  });
 };
 
 app.on(`ready`, createWindow);
+app.on(`window-all-closed`, app.quit);
 
 ipcMain.once(IPC_EVENTS.PLAYER_READY, () => require(`./mpris`).init(window));