summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-10-28 13:10:35 -0700
committerCommit bot <commit-bot@chromium.org>2016-10-28 13:10:35 -0700
commitdc0401a0da446a0744419d71f2bb216f3b90ad0f (patch)
tree3878d884b1c6948656ceb8466b130508ebdac2e1
parentb849e816eee20c256cf1da94f4ba9e233b13ac23 (diff)
downloadpdfium-dc0401a0da446a0744419d71f2bb216f3b90ad0f.tar.xz
Fix one more FX_BOOL / int issue in fpdfsdkchromium/2905chromium/2904
Review-Url: https://codereview.chromium.org/2449783008
-rw-r--r--fpdfsdk/cpdfsdk_formfillenvironment.cpp5
1 files 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,