From 3cee897ade97d0f92a363f41b8db8ddae0dc2e8e Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Wed, 23 Feb 2022 14:29:12 -0800 Subject: [PATCH 1/2] fix: race condition where webContents can be nullptr during re-focus and a multi-window close sequence --- shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm | 1 + 1 file changed, 1 insertion(+) 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..7f392332f3791 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,7 @@ - (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]; From 3fa523f0657d40d227f016f9bf1c1b736d72a5cc Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Wed, 23 Feb 2022 15:50:42 -0800 Subject: [PATCH 2/2] chore: update electron_inspectable_web_contents_view.mm --- .../browser/ui/cocoa/electron_inspectable_web_contents_view.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 7f392332f3791..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,7 +266,8 @@ - (void)viewDidBecomeFirstResponder:(NSNotification*)notification { inspectableWebContentsView_->inspectable_web_contents(); DCHECK(inspectable_web_contents); auto* webContents = inspectable_web_contents->GetWebContents(); - if (!webContents) return; + if (!webContents) + return; auto* webContentsView = webContents->GetNativeView().GetNativeNSView(); NSView* view = [notification object];