From db62494109c639597f7d59e2c9f5356cef04ada4 Mon Sep 17 00:00:00 2001
From: David Balatero <dbalatero@gmail.com>
Date: Wed, 21 Jun 2017 17:26:05 -0700
Subject: [PATCH] Force app to quit on Mac when we auto update

---
 autoupdate.js   |  3 +++
 main.js         |  6 ++++--
 package.json    |  1 +
 window_state.js | 14 ++++++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 window_state.js

diff --git a/autoupdate.js b/autoupdate.js
index 3c2fd8e7d..601934d83 100644
--- a/autoupdate.js
+++ b/autoupdate.js
@@ -1,6 +1,8 @@
 const autoUpdater = require('electron-updater').autoUpdater
 const { dialog } = require('electron');
 
+const windowState = require('./window_state');
+
 const hour = 60 * 60;
 const autoUpdaterInterval = hour * 1000;
 
@@ -32,6 +34,7 @@ function showUpdateDialog(localeMessages) {
 
     dialog.showMessageBox(options, function(response) {
       if (response == RESTART_BUTTON) {
+        windowState.markShouldQuit();
         autoUpdater.quitAndInstall();
       }
     });
diff --git a/main.js b/main.js
index 061a4df48..b5e640e3f 100644
--- a/main.js
+++ b/main.js
@@ -11,6 +11,7 @@ const ElectronConfig = require('electron-config');
 
 const autoupdate = require('./autoupdate');
 const locale = require('./locale');
+const windowState = require('./window_state');
 
 console.log('setting AUMID');
 app.setAppUserModelId('org.whispersystems.signal-desktop')
@@ -184,7 +185,7 @@ function createWindow () {
 
   // Emitted when the window is about to be closed.
   mainWindow.on('close', function (e) {
-    if (process.platform === 'darwin' && !shouldQuit && environment !== 'test') {
+    if (process.platform === 'darwin' && !windowState.shouldQuit() && environment !== 'test') {
       e.preventDefault();
       mainWindow.hide();
     }
@@ -224,8 +225,9 @@ app.on('ready', function() {
 })
 
 app.on('before-quit', function() {
-  shouldQuit = true;
+  windowState.markShouldQuit();
 });
+
 // Quit when all windows are closed.
 app.on('window-all-closed', function () {
   // On OS X it is common for applications and their menu bar
diff --git a/package.json b/package.json
index fbf06f709..894389626 100644
--- a/package.json
+++ b/package.json
@@ -110,6 +110,7 @@
       "!js/register.js",
       "!js/views/standalone_registration_view.js",
       "preload.js",
+      "window_state.js",
       "autoupdate.js",
       "locale.js",
       "main.js",
diff --git a/window_state.js b/window_state.js
new file mode 100644
index 000000000..6d264339c
--- /dev/null
+++ b/window_state.js
@@ -0,0 +1,14 @@
+let shouldQuitFlag = false;
+
+function markShouldQuit() {
+  shouldQuitFlag = true;
+}
+
+function shouldQuit() {
+  return shouldQuitFlag;
+}
+
+module.exports = {
+  shouldQuit,
+  markShouldQuit
+};