From fde96be168ad86b85fcc7058a0c780e8a05a557a Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 5 May 2021 12:48:07 -0400
Subject: [PATCH] Fix crash closing DevTools window (fixes issue #3111)

---
 libcef/browser/devtools/devtools_frontend.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libcef/browser/devtools/devtools_frontend.cc b/libcef/browser/devtools/devtools_frontend.cc
index 0d4e6605c..9a94ec99b 100644
--- a/libcef/browser/devtools/devtools_frontend.cc
+++ b/libcef/browser/devtools/devtools_frontend.cc
@@ -532,8 +532,10 @@ void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(
 void CefDevToolsFrontend::DispatchProtocolMessage(
     content::DevToolsAgentHost* agent_host,
     base::span<const uint8_t> message) {
-  if (frontend_browser_->GetWebContents()->IsBeingDestroyed())
+  if (!frontend_browser_->GetWebContents() ||
+      frontend_browser_->GetWebContents()->IsBeingDestroyed()) {
     return;
+  }
 
   base::StringPiece str_message(reinterpret_cast<const char*>(message.data()),
                                 message.size());