From dfbf8e7ba55695c4e6cb30eadbe9c6a2955815ba Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 14 Oct 2015 14:17:26 -0700 Subject: Next round of XFA changes to match master. This contains a missed merge of the Document:delay fixes. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1398703009 . --- fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'fpdfsdk/src/pdfwindow') diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp index 932f8c56d6..2a9afe7dc6 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp @@ -594,10 +594,7 @@ FX_BOOL CPWL_ComboBox::OnChar(FX_WORD nChar, FX_DWORD nFlag) { if (bExit) return FALSE; } - if (m_pList->OnCharWithExit(nChar, bExit, nFlag)) - return bExit; - - return FALSE; + return m_pList->OnCharWithExit(nChar, bExit, nFlag) ? bExit : FALSE; } void CPWL_ComboBox::OnNotify(CPWL_Wnd* pWnd, -- cgit v1.2.3