fix: crash in BrowserWindow destructor after win.webContents.destroy()

electron · Jun 7, 2019 · b1e9fd1 · b1e9fd1
1 parent abab90f
commit b1e9fd1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/atom/browser/api/atom_api_browser_window.cc b/atom/browser/api/atom_api_browser_window.cc
@@ -94,11 +94,12 @@ BrowserWindow::BrowserWindow(v8::Isolate* isolate,
 }
 
 BrowserWindow::~BrowserWindow() {
-  api_web_contents_->RemoveObserver(this);
   // Note that the OnWindowClosed will not be called after the destructor runs,
   // since the window object is managed by the TopLevelWindow class.
-  if (web_contents())
+  if (web_contents()) {
+    api_web_contents_->RemoveObserver(this);
     Cleanup();
+  }
 }
 
 void BrowserWindow::OnInputEvent(const blink::WebInputEvent& event) {