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

fix: destroy WebContents synchronously on shutdown (#15541)

Browse source
This commit is contained in:
Cheng Zhao 2018-11-09 00:57:28 +09:00 • committed by Shelley Vohr
parent 6162d9090d
commit 746beb0d8b
12 changed files with 122 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_browser_window.cc
View file

@ -381,7 +381,9 @@ void BrowserWindow::Cleanup() {
if (host)
host->GetWidget()->RemoveInputEventObserver(this);
api_web_contents_->DestroyWebContents(true /* async */);
// Destroy WebContents asynchronously unless app is shutting down,
// because destroy() might be called inside WebContents's event handler.
api_web_contents_->DestroyWebContents(!Browser::Get()->is_shutting_down());
Observe(nullptr);
}