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

fix: BrowserView crash when 'beforeunload' prevented (#37205)

Browse source 
fix: crash when beforeunload prevented
This commit is contained in:
Shelley Vohr 2023-02-14 18:40:37 +01:00 • committed by GitHub
parent 4d6f230d21
commit 8eee4f2df1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,7 +112,6 @@ BrowserWindow::~BrowserWindow() {
api_web_contents_->RemoveObserver(this); api_web_contents_->RemoveObserver(this);
// Destroy the WebContents. // Destroy the WebContents.
OnCloseContents(); OnCloseContents();
api_web_contents_->Destroy();
} }
} }
@ -140,6 +139,7 @@ void BrowserWindow::WebContentsDestroyed() {
void BrowserWindow::OnCloseContents() { void BrowserWindow::OnCloseContents() {
BaseWindow::ResetBrowserViews(); BaseWindow::ResetBrowserViews();
api_web_contents_->Destroy();
} }
void BrowserWindow::OnRendererResponsive(content::RenderProcessHost*) { void BrowserWindow::OnRendererResponsive(content::RenderProcessHost*) {

4
shell/browser/api/electron_api_web_contents.cc
View file

@ -1222,7 +1222,9 @@ void WebContents::CloseContents(content::WebContents* source) {
for (ExtendedWebContentsObserver& observer : observers_) for (ExtendedWebContentsObserver& observer : observers_)
observer.OnCloseContents(); observer.OnCloseContents();
Destroy(); // If there are observers, OnCloseContents will call Destroy()
if (observers_.empty())
Destroy();
} }
void WebContents::ActivateContents(content::WebContents* source) { void WebContents::ActivateContents(content::WebContents* source) {