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

fix: crash on close window when webContents destroyed (#31620)

Browse source
This commit is contained in:
Shelley Vohr 2021-11-01 05:32:54 +01:00 committed by GitHub
parent a6e5ff3607
commit 20b4813cf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/api/electron_api_browser_window.cc
View file

@ -254,7 +254,7 @@ void BrowserWindow::OnCloseButtonClicked(bool* prevent_default) {
ScheduleUnresponsiveEvent(5000); ScheduleUnresponsiveEvent(5000);
// Already closed by renderer. // Already closed by renderer.
if (!web_contents()) if (!web_contents() || !api_web_contents_)
return; return;
// Required to make beforeunload handler work. // Required to make beforeunload handler work.

5
spec-main/api-browser-window-spec.ts
View file

@ -110,6 +110,11 @@ describe('BrowserWindow module', () => {
await closed; await closed;
}); });
it('should not crash if called after webContents is destroyed', () => {
w.webContents.destroy();
w.webContents.on('destroyed', () => w.close());
});
it('should emit unload handler', async () => { it('should emit unload handler', async () => {
await w.loadFile(path.join(fixtures, 'api', 'unload.html')); await w.loadFile(path.join(fixtures, 'api', 'unload.html'));
const closed = emittedOnce(w, 'closed'); const closed = emittedOnce(w, 'closed');