From 0cf9e2eb8c328d7857653681715e10b322bb1ec1 Mon Sep 17 00:00:00 2001
From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com>
Date: Sun, 4 Oct 2020 08:20:23 +0900
Subject: [PATCH] =?UTF-8?q?GetEncofing=5Fmeta=E3=81=A7=E3=81=AEif=E6=96=87?=
 =?UTF-8?q?=E3=81=AE=E5=88=A4=E5=AE=9A=E5=9B=9E=E6=95=B0=E3=82=92=E6=B8=9B?=
 =?UTF-8?q?=E3=82=89=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sakura_core/charset/CESI.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/sakura_core/charset/CESI.cpp b/sakura_core/charset/CESI.cpp
index b270047615..2d0f4d7463 100644
--- a/sakura_core/charset/CESI.cpp
+++ b/sakura_core/charset/CESI.cpp
@@ -508,13 +508,12 @@ void CESI::GetEncodingInfo_meta( const char* pS, const int nLen )
 		if( nret != CODE_NONE ){
 			// 判定に成功した場合はencodingを更新する
 			encoding = nret;
-		}
-	}
-	if( encoding == CODE_NONE || encoding == CODE_AUTODETECT ){
-		nret = AutoDetectByHTML( pS, nLen );
-		if( nret != CODE_NONE ){
-			// 判定に成功した場合はencodingを更新する
-			encoding = nret;
+		} else {
+			nret = AutoDetectByHTML( pS, nLen );
+			if( nret != CODE_NONE ){
+				// 判定に成功した場合はencodingを更新する
+				encoding = nret;
+			}
 		}
 	}
 	m_eMetaName = encoding;