mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Enable the quitAndInstall to be cancelled by beforeunload handler.

Browse source
This commit is contained in:
Cheng Zhao 2014-02-17 16:25:00 +08:00
parent 07fc2b41af
commit 274c9d04b1
3 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
browser/api/atom_api_auto_updater.cc
View file

@ -81,10 +81,8 @@ void AutoUpdater::QuitAndInstall(
const v8::FunctionCallbackInfo<v8::Value>& args) {
AutoUpdater* self = AutoUpdater::Unwrap<AutoUpdater>(args.This());
if (!self->quit_and_install_.is_null()) {
if (!self->quit_and_install_.is_null())
self->quit_and_install_.Run();
self->quit_and_install_.Reset();
}
}
// static

5
browser/api/lib/auto-updater.coffee
View file

@ -20,9 +20,6 @@ autoUpdater.quitAndInstall = ->
app = require 'app'
app.removeAllListeners 'window-all-closed'
app.once 'window-all-closed', AutoUpdater::quitAndInstall.bind(this)
# Tell all windows to remove beforeunload handler and then close itself.
ipc = require 'ipc'
ipc.sendChannel win, 'ATOM_SHELL_SILENT_CLOSE' for win in windows
win.close() for win in windows
module.exports = autoUpdater