Merge branch 'master' into add-editor-rulers

lib/main-app.js

@@ -69,6 +69,10 @@ ipc.on('update-app-confirm', function (event, msg) {
   }
 })
 
+app.on('window-all-closed', function () {
+  app.quit()
+})
+
 app.on('ready', function () {
   mainWindow = require('./main-window')
 

lib/main-window.js

@@ -56,11 +56,8 @@ if (process.platform === 'darwin' || process.env.DESKTOP_SESSION === 'cinnamon')
   app.on('before-quit', function (e) {
     mainWindow.removeAllListeners()
   })
-} else {
-  app.on('window-all-closed', function () {
-    app.quit()
-  })
 }
+
 mainWindow.on('resize', _.throttle(storeWindowSize, 500))
 
 function storeWindowSize () {