From 4eb4d7f6c707cc2c23c806aa540d055c8832b55d Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Wed, 22 Jul 2015 15:04:26 -0700
Subject: Revert "Fix else-after-returns throughout pdfium."

This reverts commit 7cc97521db1e52d5927f5605de5f9a7102f8af40.
---
 core/src/fpdfdoc/doc_formfield.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'core/src/fpdfdoc/doc_formfield.cpp')

diff --git a/core/src/fpdfdoc/doc_formfield.cpp b/core/src/fpdfdoc/doc_formfield.cpp
index 087eba8aa4..d1acab8e81 100644
--- a/core/src/fpdfdoc/doc_formfield.cpp
+++ b/core/src/fpdfdoc/doc_formfield.cpp
@@ -472,15 +472,14 @@ int CPDF_FormField::GetSelectedIndex(int index)
             return -1;
         }
     }
-    if (pValue->GetType() == PDFOBJ_NUMBER) {
-        return pValue->GetInteger();
-    }
     CFX_WideString sel_value;
     if (pValue->GetType() == PDFOBJ_STRING) {
         if (index != 0) {
             return -1;
         }
         sel_value = pValue->GetUnicodeText();
+    } else if (pValue->GetType() == PDFOBJ_NUMBER) {
+        return pValue->GetInteger();
     } else {
         if (pValue->GetType() != PDFOBJ_ARRAY) {
             return -1;
-- 
cgit v1.2.3