Merge pull request #226 from electron/fix-crash

Fix double free when closing window with devtools opened
electron-archive · Jun 14, 2016 · 8978bc6 · 8978bc6
2 parents 097d14b + 55423bd
commit 8978bc6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/browser/inspectable_web_contents_impl.cc b/browser/inspectable_web_contents_impl.cc
@@ -226,6 +226,7 @@ InspectableWebContentsImpl::InspectableWebContentsImpl(
 }
 
 InspectableWebContentsImpl::~InspectableWebContentsImpl() {
+  Observe(nullptr);
 }
 
 InspectableWebContentsView* InspectableWebContentsImpl::GetView() const {
@@ -618,7 +619,6 @@ void InspectableWebContentsImpl::RenderFrameHostChanged(
 
 void InspectableWebContentsImpl::WebContentsDestroyed() {
   frontend_loaded_ = false;
-  Observe(nullptr);
   Detach();
 
   for (const auto& pair : pending_requests_)