commit dc0401a0da446a0744419d71f2bb216f3b90ad0f
author tsepez <tsepez@chromium.org> Fri Oct 28 13:10:35 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Oct 28 13:10:35 2016 -0700
tree 3878d884b1c6948656ceb8466b130508ebdac2e1
parent b849e816eee20c256cf1da94f4ba9e233b13ac23

Fix one more FX_BOOL / int issue in fpdfsdk

Review-Url: https://codereview.chromium.org/2449783008

fpdfsdk/cpdfsdk_formfillenvironment.cpp

diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index f729f71..1f39de9 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -430,9 +430,8 @@
                                                FPDF_WIDGET hWidget,
                                                int menuFlag,
                                                CFX_PointF pt) {
-  if (!m_pInfo || !m_pInfo->FFI_PopupMenu)
-    return FALSE;
-  return m_pInfo->FFI_PopupMenu(m_pInfo, page, hWidget, menuFlag, pt.x, pt.y);
+  return m_pInfo && m_pInfo->FFI_PopupMenu &&
+         m_pInfo->FFI_PopupMenu(m_pInfo, page, hWidget, menuFlag, pt.x, pt.y);
 }
 
 void CPDFSDK_FormFillEnvironment::Alert(FPDF_WIDESTRING Msg,