Return early when render widget host view is null

brave · Jul 29, 2016 · bf0cc2b · bf0cc2b
1 parent ede32c2
commit bf0cc2b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/atom/browser/api/atom_api_web_contents_mac.mm b/atom/browser/api/atom_api_web_contents_mac.mm
@@ -13,6 +13,9 @@ - (BOOL)isKeyWindow;
 namespace api {
 
 bool WebContents::IsFocused() const {
+  auto view = web_contents()->GetRenderWidgetHostView();
+  if (!view) return false;
+
   if (GetType() != BACKGROUND_PAGE) {
     auto window = web_contents()->GetTopLevelNativeWindow();
     // On Mac the render widget host view does not lose focus when the window
@@ -21,8 +24,7 @@ - (BOOL)isKeyWindow;
       return false;
   }
 
-  auto view = web_contents()->GetRenderWidgetHostView();
-  return view && view->HasFocus();
+  return view->HasFocus();
 }
 
 }  // namespace api