docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where error would occur when sending quit message to render process

This commit is contained in:
Jeffrey Morgan 2015-06-15 14:58:23 -07:00
parent 9550e88fa8
commit a47cc6cdee
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/browser.js
View File

@ -2,6 +2,7 @@ var app = require('app');
var autoUpdater = require('auto-updater'); var autoUpdater = require('auto-updater');
var BrowserWindow = require('browser-window'); var BrowserWindow = require('browser-window');
var fs = require('fs'); var fs = require('fs');
var os = require('os');
var ipc = require('ipc'); var ipc = require('ipc');
var path = require('path'); var path = require('path');
@ -90,12 +91,21 @@ app.on('ready', function () {
autoUpdater.quitAndInstall(); autoUpdater.quitAndInstall();
}); });
app.on('before-quit', function () { if (os.platform() === 'win32') {
// TODO: make this work for right click + close mainWindow.on('close', function () {
if (!updating && mainWindow.webContents) {
mainWindow.webContents.send('application:quitting'); mainWindow.webContents.send('application:quitting');
} return true;
}); });
app.on('window-all-closed', function() {
app.quit();
});
} else if (os.platform() === 'darwin') {
app.on('before-quit', function () {
if (!updating) {
mainWindow.webContents.send('application:quitting');
}
});
}
mainWindow.webContents.on('new-window', function (e) { mainWindow.webContents.on('new-window', function (e) {
e.preventDefault(); e.preventDefault();
@ -125,7 +135,7 @@ app.on('ready', function () {
}); });
if (process.env.NODE_ENV !== 'development') { if (process.env.NODE_ENV !== 'development') {
autoUpdater.setFeedUrl('https://updates.kitematic.com/releases/latest?version=' + app.getVersion() + '&beta=' + !!settingsjson.beta); autoUpdater.setFeedUrl('https://updates.kitematic.com/releases/latest?version=' + app.getVersion() + '&beta=' + !!settingsjson.beta + '&platform=' + os.platform());
} }
}); });