fix popup menu in background page crashes nw

fixed nwjs#5513
ghostoy · Dec 15, 2016 · fdc51c6 · fdc51c6
1 parent a83e646
commit fdc51c6
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/api/menu/menu.cc b/src/api/menu/menu.cc
@@ -67,16 +67,20 @@ void Menu::Call(const std::string& method,
     arguments.GetInteger(1, &y);
     content::WebContents* web_contents = content::WebContents::FromRenderFrameHost(rvh);
     DCHECK(web_contents);
-    double zoom_factor = content::ZoomLevelToZoomFactor(
-      zoom::ZoomController::FromWebContents(web_contents)->GetZoomLevel());
-    if (zoom_factor > content::kMaximumZoomFactor) {
-      zoom_factor = content::kMaximumZoomFactor;
-    }
-    if (zoom_factor < content::kMinimumZoomFactor) {
-      zoom_factor = content::kMinimumZoomFactor;
+    zoom::ZoomController* zoom_controller = zoom::ZoomController::FromWebContents(web_contents);
+
+    if (zoom_controller) {
+      double zoom_factor = content::ZoomLevelToZoomFactor(zoom_controller->GetZoomLevel());
+      if (zoom_factor > content::kMaximumZoomFactor) {
+        zoom_factor = content::kMaximumZoomFactor;
+      }
+      if (zoom_factor < content::kMinimumZoomFactor) {
+        zoom_factor = content::kMinimumZoomFactor;
+      }
+      x *= zoom_factor;
+      y *= zoom_factor;
     }
-    x *= zoom_factor;
-    y *= zoom_factor;
+
     Popup(x, y, rvh);
   } else if (method == "EnableShowEvent") {
     arguments.GetBoolean(0, &enable_show_event_);