Merge pull request #265 from hypermodules/fix-windows-lifecycle

Fix windows lifecycle

Author: bcomnes

CHANGELOG.md

@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.5.5 - 2017-11-10
+* Fix window (and linux?) lifecycle bug
+
 ## 0.5.4 - 2017-11-10
 * Update choo devtools
 * Remove choo log

main/index.js

@@ -35,6 +35,22 @@ var al = new AudioLibrary(libraryPersist.store)
 module.exports = state
 module.exports.al = al
 
+var shouldQuit = app.makeSingleInstance(function (commandLine, workingDirectory) {
+  // https://github.com/electron/electron/blob/v0.36.10/docs/api/app.md#appmakesingleinstancecallback
+  // Someone tried to run a second instance, we should focus our window.
+  if (player.win) {
+    if (player.win.isMinimized()) player.win.restore()
+    player.win.focus()
+  } else {
+    al.recall()
+    player.init()
+  }
+})
+
+if (shouldQuit) {
+  app.exit()
+}
+
 app.on('ready', function appReady () {
   menu.init()
   audio.init()
@@ -215,6 +231,13 @@ app.on('ready', function appReady () {
   setTimeout(() => {
     autoUpdater.checkForUpdatesAndNotify()
   }, 500)
+
+  if (process.platform !== 'darwin') { // TODO System tray on windows (maybe linux)
+    // since window-all-closed doesn't fire with our hidden audio process
+    player.win.once('closed', () => {
+      app.quit()
+    })
+  }
 })
 
 autoUpdater.on('error', (err) => {
@@ -249,10 +272,6 @@ autoUpdater.on('update-downloaded', (info) => {
   console.log(info)
 })
 
-app.on('window-all-closed', function allWindowsClosed () {
-  if (process.platform !== 'darwin') app.quit()
-})
-
 app.on('activate', function activate () {
   if (player.win === null) {
     al.recall()