GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

MOBILE-2478 desktop: Prevent errors when calling close in closed windows

Browse Source
This commit is contained in:
Dani Palou 2018-07-23 10:37:02 +02:00
parent 4b45b3120b
commit efb5db4f47
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desktop/electron.js
View File

@ -184,10 +184,11 @@ ipcMain.on('openItem', (event, path) => {
}); });
ipcMain.on('closeSecondaryWindows', () => { ipcMain.on('closeSecondaryWindows', () => {
var windows = BrowserWindow.getAllWindows(); const windows = BrowserWindow.getAllWindows();
for (var i = 0; i < windows.length; i++) { for (let i = 0; i < windows.length; i++) {
if (!mainWindow || windows[i].id != mainWindow.id) { const win = windows[i];
windows[i].close(); if (!win.isDestroyed() && (!mainWindow || win.id != mainWindow.id)) {
win.close();
} }
} }
}); });

9
src/core/emulator/classes/inappbrowserobject.ts
View File

@ -94,7 +94,16 @@ export class InAppBrowserObjectMock {
* Close the window. * Close the window.
*/ */
close(): void { close(): void {
if (this.window.isDestroyed()) {
// Window already closed, nothing to do.
return;
}
try {
this.window.close(); this.window.close();
} catch (ex) {
// Ignore errors.
}
} }
/** /**