From f20f1b176f4c9fd8e4520778e51c7e998a36c4c0 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 16 Mar 2022 09:57:37 -0400
Subject: [PATCH] fix: race condition where webContents can be nullptr during
 re-focus and a multi-window close sequence (#33283)

* fix: race condition where webContents can be nullptr during re-focus and a multi-window close sequence

* chore: update electron_inspectable_web_contents_view.mm

Co-authored-by: Samuel Attard <sam@electronjs.org>
---
 .../browser/ui/cocoa/electron_inspectable_web_contents_view.mm  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm
index e4b797a001a1e..3f86dca5158e5 100644
--- a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm
+++ b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm
@@ -266,6 +266,8 @@ - (void)viewDidBecomeFirstResponder:(NSNotification*)notification {
       inspectableWebContentsView_->inspectable_web_contents();
   DCHECK(inspectable_web_contents);
   auto* webContents = inspectable_web_contents->GetWebContents();
+  if (!webContents)
+    return;
   auto* webContentsView = webContents->GetNativeView().GetNativeNSView();
 
   NSView* view = [notification object];