1 files changed, 8 insertions, 13 deletions

diff --git a/fpdfsdk/fsdk_baseform.cpp b/fpdfsdk/fsdk_baseform.cpp
index bfdcb2dbca..4124ebfbce 100644
--- a/fpdfsdk/fsdk_baseform.cpp
+++ b/fpdfsdk/fsdk_baseform.cpp
@@ -237,25 +237,20 @@ FX_BOOL CPDFSDK_Widget::OnXFAAAction(PDFSDK_XFAAActionType eXFAAAT,
           if (IXFA_Widget* hGroupWidget = GetGroupMixXFAWidget()) {
             CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hGroupWidget);
             param.m_pTarget = pAcc;
-            pXFAWidgetHandler->ProcessEvent(pAcc, &param);
-          }
-
-          {
-            CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget);
-            param.m_pTarget = pAcc;
-            int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);
-            return nRet == XFA_EVENTERROR_Success;
+            if (pXFAWidgetHandler->ProcessEvent(pAcc, &param) !=
+                XFA_EVENTERROR_Success) {
+              return FALSE;
+            }
           }
-        } else {
-          CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget);
-          param.m_pTarget = pAcc;
-          int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);
-          return nRet == XFA_EVENTERROR_Success;
         }
+        CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget);
+        param.m_pTarget = pAcc;
+        int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);
 
         if (IXFA_DocView* pDocView = pDoc->GetXFADocView()) {
           pDocView->UpdateDocView();
         }
+        return nRet == XFA_EVENTERROR_Success;
       }
     }
   }