Merge pull request #61 from FleekHQ/fix-close-on-darwin

Fix close window on darwin
FleekHQ · Jun 10, 2020 · 7c35372 · 7c35372
2 parents 3c1113d + 3935152
commit 7c35372
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/public/electron.js b/public/electron.js
@@ -47,7 +47,16 @@ const createWindow = () => {
     mainWindow.webContents.openDevTools();
   }
 
-  mainWindow.on('closed', () => (mainWindow = null));
+  mainWindow.on('closed', () => mainWindow = null);
+
+  mainWindow.on('close', (event) => {
+    if (app.quitting) {
+      mainWindow = null;
+    } else {
+      event.preventDefault();
+      mainWindow.hide();
+    }
+  });
 
   destroyStream = registerEvents(mainWindow);
 };
@@ -65,5 +74,9 @@ app.on('window-all-closed', () => {
 app.on('activate', () => {
   if (!mainWindow) {
     createWindow();
+  } else {
+    mainWindow.show();
   }
 });
+
+app.on('before-quit', () => app.quitting = true);