From 3220b43cd7e0d50577fd9797f2eb01acfc5836f0 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 9 Mar 2015 12:01:09 -0400 Subject: [PATCH] Don't turn off VM if restarting to update --- src/Main.js | 4 ++-- src/browser.js | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Main.js b/src/Main.js index c0df3ed256..a0d5d5b54b 100644 --- a/src/Main.js +++ b/src/Main.js @@ -46,8 +46,8 @@ SetupStore.setup().then(() => { }); }); -ipc.on('application:quitting', () => { - if (localStorage.getItem('settings.closeVMOnQuit') === 'true') { +ipc.on('application:quitting', opts => { + if (!opts.updating && localStorage.getItem('settings.closeVMOnQuit') === 'true') { machine.stop(); } }); diff --git a/src/browser.js b/src/browser.js index 10e2ba253e..8722673dcb 100644 --- a/src/browser.js +++ b/src/browser.js @@ -38,12 +38,16 @@ app.on('ready', function () { return false; }); - app.on('before-quit', function () { - mainWindow.webContents.send('application:quitting'); + var updating = false; + ipc.on('application:quit-install', function () { + updating = true; + autoUpdater.quitAndInstall(); }); - ipc.on('application:quit-install', function () { - autoUpdater.quitAndInstall(); + app.on('before-quit', function () { + mainWindow.webContents.send('application:quitting', { + updating: updating + }); }); mainWindow.webContents.on('new-window', function (e) {