From dc0401a0da446a0744419d71f2bb216f3b90ad0f Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Fri, 28 Oct 2016 13:10:35 -0700
Subject: Fix one more FX_BOOL / int issue in fpdfsdk

Review-Url: https://codereview.chromium.org/2449783008
---
 fpdfsdk/cpdfsdk_formfillenvironment.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index f729f717d9..1f39de9069 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -430,9 +430,8 @@ FX_BOOL CPDFSDK_FormFillEnvironment::PopupMenu(FPDF_PAGE page,
                                                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,
-- 
cgit v1.2.3