fix: crash when beforeunload prevented

electron · Feb 9, 2023 · 3dac168 · 3dac168
1 parent 478ce96
commit 3dac168
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/shell/browser/api/electron_api_browser_view.cc b/shell/browser/api/electron_api_browser_view.cc
@@ -119,6 +119,7 @@ int BrowserView::NonClientHitTest(const gfx::Point& point) {
 }
 
 BrowserView::~BrowserView() {
+  LOG(INFO) << "BrowserView::~BrowserView()";
   if (web_contents()) {  // destroy() called without closing WebContents
     web_contents()->RemoveObserver(this);
     web_contents()->Destroy();

diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc
@@ -112,7 +112,6 @@ BrowserWindow::~BrowserWindow() {
     api_web_contents_->RemoveObserver(this);
     // Destroy the WebContents.
     OnCloseContents();
-    api_web_contents_->Destroy();
   }
 }
 
@@ -140,6 +139,7 @@ void BrowserWindow::WebContentsDestroyed() {
 
 void BrowserWindow::OnCloseContents() {
   BaseWindow::ResetBrowserViews();
+  api_web_contents_->Destroy();
 }
 
 void BrowserWindow::OnRendererResponsive(content::RenderProcessHost*) {

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
@@ -1221,8 +1221,6 @@ void WebContents::CloseContents(content::WebContents* source) {
 
   for (ExtendedWebContentsObserver& observer : observers_)
     observer.OnCloseContents();
-
-  Destroy();
 }
 
 void WebContents::ActivateContents(content::WebContents* source) {