Merge pull request #41 from holochain/fix-quit

Fix CMD+Q on macOS
holochain · Dec 2, 2019 · e34025f · e34025f
2 parents 6e99a9e + 8aeb3e2
commit e34025f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/holoscape.js b/holoscape.js
@@ -286,7 +286,7 @@ class Holoscape {
         { type: 'separator' },
         { label: 'Install hApp...', click: ()=>this.installBundleWindow.show() },
         { type: 'separator' },
-        { label: 'Quit', click: ()=>{this.shutdownConductor(); this.quitting=true; mb.app.quit()} }
+        { label: 'Quit', click: ()=> this.quit() }
       ])
       mb.tray.setToolTip('HoloScape')
       mb.tray.setContextMenu(contextMenu)
@@ -399,6 +399,12 @@ class Holoscape {
         global.holoscape.checkConductorConnection()
       })
     }
+
+    quit() {
+      this.shutdownConductor()
+      this.quitting=true
+      mb.app.quit()
+    }
   }
 
 const systemTrayIconFull = () => {

diff --git a/main.js b/main.js
@@ -46,6 +46,12 @@ app.on('window-all-closed', e => {
   if(!global.holoscape.quitting) e.preventDefault()
 })
 
+app.on('before-quit', e => {
+  if(!global.holoscape.quitting) {
+    global.holoscape.quit()
+  }
+})
+
 mb.on('ready', async () => {
   mb.tray.setImage(systemTrayIconEmpty())
   global.holoscape = new Holoscape()