mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Force app to quit on Mac when we auto update

Browse source
This commit is contained in:
David Balatero 2017-06-21 17:26:05 -07:00 • committed by Scott Nonnenberg
parent 07d8b862db
commit db62494109
No known key found for this signature in database
GPG key ID: A4931C09644C654B
4 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
main.js
View file

@ -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