chore: fix crash on missing RenderWidgetHostView

electron · Apr 24, 2023 · 04cf758 · 04cf758
1 parent b626be5
commit 04cf758
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm
@@ -281,18 +281,21 @@ - (void)redispatchContextMenuEvent:(NSEvent*)event {
           (event.modifierFlags & NSEventModifierFlagControl)));
   content::WebContents* contents =
       inspectableWebContentsView_->inspectable_web_contents()->GetWebContents();
+
   electron::api::WebContents* api_contents =
       electron::api::WebContents::From(contents);
   if (api_contents) {
     // Temporarily pretend that the WebContents is fully non-draggable while we
     // re-send the mouse event. This allows the re-dispatched event to "land"
     // on the WebContents, instead of "falling through" back to the window.
-    api_contents->SetForceNonDraggable(true);
-    BaseView* contentsView = (BaseView*)contents->GetRenderWidgetHostView()
-                                 ->GetNativeView()
-                                 .GetNativeNSView();
-    [contentsView mouseEvent:event];
-    api_contents->SetForceNonDraggable(false);
+    auto* rwhv = contents->GetRenderWidgetHostView();
+    if (rwhv) {
+      api_contents->SetForceNonDraggable(true);
+      BaseView* contentsView =
+          (BaseView*)rwhv->GetNativeView().GetNativeNSView();
+      [contentsView mouseEvent:event];
+      api_contents->SetForceNonDraggable(false);
+    }
   }
 }