if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-12-27 17:31:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

ELECTRON-816: add checks for crash events when it is killed (#544)

Browse Source 
Currently on Windows, when the app is killed, a crash event is emitted which sends the wrong signal to the user that the app actually crashed which isn't the case because the app was in fact killed. So, this PR adds an extra check to see if the app was killed and shows the crash dialog based on that.
This commit is contained in:
Vishwas Shashidhar 2019-01-11 11:37:59 +05:30 committed by GitHub
parent 0bb617aab3
commit 28d9826236
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 61 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/aboutApp/index.js
View File

@ -95,7 +95,14 @@ function openAboutWindow(windowName) {
}
});
aboutWindow.webContents.on('crashed', function () {
aboutWindow.webContents.on('crashed', function (event, killed) {
log.send(logLevels.INFO, `About Window crashed! Killed? ${killed}`);
if (killed) {
return;
}
const options = {
type: 'error',
title: i18n.getMessageFor('Renderer Process Crashed'),
@ -129,4 +136,4 @@ function destroyWindow() {
module.exports = {
openAboutWindow: openAboutWindow
};
};

11
js/basicAuth/index.js
View File

@ -111,7 +111,14 @@ function openBasicAuthWindow(windowName, hostname, isValidCredentials, clearSett
}
});
basicAuthWindow.webContents.on('crashed', function () {
basicAuthWindow.webContents.on('crashed', function (event, killed) {
log.send(logLevels.INFO, `Basic Auth Window crashed! Killed? ${killed}`);
if (killed) {
return;
}
const options = {
type: 'error',
title: i18n.getMessageFor('Renderer Process Crashed'),
@ -167,4 +174,4 @@ function closeAuthWindow(clearSettings) {
module.exports = {
openBasicAuthWindow: openBasicAuthWindow
};
};

11
js/desktopCapturer/index.js
View File

@ -106,7 +106,14 @@ function openScreenPickerWindow(eventSender, sources, id) {
screenPickerWindow.webContents.send('desktop-capturer-sources', sources, isWindowsOS);
});
screenPickerWindow.webContents.on('crashed', function () {
screenPickerWindow.webContents.on('crashed', function (event, killed) {
log.send(logLevels.INFO, `Screen Picker Window crashed! Killed? ${killed}`);
if (killed) {
return;
}
const options = {
type: 'error',
title: i18n.getMessageFor('Renderer Process Crashed'),
@ -164,4 +171,4 @@ ipc.on('close-screen-picker', () => {
module.exports = {
openScreenPickerWindow
};
};

11
js/moreInfo/index.js
View File

@ -95,7 +95,14 @@ function openMoreInfoWindow(windowName) {
}
});
moreInfoWindow.webContents.on('crashed', function () {
moreInfoWindow.webContents.on('crashed', function (event, killed) {
log.send(logLevels.INFO, `More Info Window crashed! Killed? ${killed}`);
if (killed) {
return;
}
const options = {
type: 'error',
title: i18n.getMessageFor('Renderer Process Crashed'),
@ -129,4 +136,4 @@ function destroyWindow() {
module.exports = {
openMoreInfoWindow: openMoreInfoWindow
};
};

13
js/screenSharingIndicator/index.js
View File

@ -69,7 +69,14 @@ function openScreenSharingIndicator(eventSender, displayId, id) {
});
});
indicatorWindow.webContents.on('crashed', () => {
indicatorWindow.webContents.on('crashed', (event, killed) => {
log.send(logLevels.INFO, `Screen Sharing Indicator Window crashed! Killed? ${killed}`);
if (killed) {
return;
}
const errorDialogOptions = {
type: 'error',
title: i18n.getMessageFor('Renderer Process Crashed'),
@ -83,7 +90,7 @@ function openScreenSharingIndicator(eventSender, displayId, id) {
if (indicatorId === id) {
eventSender.send('stop-sharing-requested', id);
}
}
};
const handleDestroyScreensharingIndicator = (event, indicatorId) => {
if (indicatorId === id) {
@ -101,4 +108,4 @@ function openScreenSharingIndicator(eventSender, displayId, id) {
module.exports = {
openScreenSharingIndicator
};
};

19
js/windowMgr.js
View File

@ -327,7 +327,14 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
// In case a renderer process crashes, provide an
// option for the user to either reload or close the window
mainWindow.webContents.on('crashed', function () {
mainWindow.webContents.on('crashed', function (event, killed) {
log.send(logLevels.INFO, `Main Window crashed! Killed? ${killed}`);
if (killed) {
return;
}
const options = {
type: 'error',
title: i18n.getMessageFor('Renderer Process Crashed'),
@ -506,8 +513,12 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
browserWin.setAlwaysOnTop(alwaysOnTop);
logBrowserWindowEvents(browserWin, browserWin.winName);
let handleChildWindowCrashEvent = (e) => {
log.send(logLevels.INFO, `Child Window crashed!`);
let handleChildWindowCrashEvent = (e, killed) => {
log.send(logLevels.INFO, `Child Window crashed! Killed? ${killed}`);
if (killed) {
return;
}
const options = {
type: 'error',
title: i18n.getMessageFor('Renderer Process Crashed'),
@ -996,7 +1007,7 @@ function isAlwaysOnTop(boolean, shouldActivateMainWindow = true) {
}
// node event emitter to update always on top
eventEmitter.on('isAlwaysOnTop', (params) => {
eventEmitter.on('isAlwaysOnTop', (params) => {
isAlwaysOnTop(params.isAlwaysOnTop, params.shouldActivateMainWindow);
log.send(logLevels.INFO, `Updating settings for always on top ${params}`);
});