From 57bc8222e693a85e1b3c3b4d15ce6fe181adb4f4 Mon Sep 17 00:00:00 2001
From: berryplus <berryzplus@gmail.com>
Date: Wed, 25 Sep 2019 23:30:50 +0900
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=AD=97=E3=82=B3=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=81=AE=E6=8C=87=E5=AE=9A=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD?=
 =?UTF-8?q?=E3=82=B0=E3=81=AECP=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=81=AE=E4=BB=95=E6=A7=98=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=99?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sakura_core/dlg/CDlgSetCharSet.cpp | 10 +++-------
 sakura_core/dlg/CDlgSetCharSet.h   |  1 -
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/sakura_core/dlg/CDlgSetCharSet.cpp b/sakura_core/dlg/CDlgSetCharSet.cpp
index 5a9495ea19..5a3ae32ec5 100644
--- a/sakura_core/dlg/CDlgSetCharSet.cpp
+++ b/sakura_core/dlg/CDlgSetCharSet.cpp
@@ -34,7 +34,6 @@ CDlgSetCharSet::CDlgSetCharSet()
 {
 	m_pnCharSet = NULL;			// 文字コードセット
 	m_pbBom = NULL;				// 文字コードセット
-	m_bCP = false;
 }
 
 /* モーダルダイアログの表示 */
@@ -73,11 +72,9 @@ BOOL CDlgSetCharSet::OnBnClicked( int wID )
 {
 	switch( wID ){
 	case IDC_CHECK_CP:
-		if( !m_bCP ){
-			m_bCP = true;
-			::EnableWindow( GetItemHwnd( IDC_CHECK_CP ), FALSE );
-			CCodePage::AddComboCodePages( GetHwnd(), m_hwndCharSet, -1 );
-		}
+		::CheckDlgButton( GetHwnd(), IDC_CHECK_CP, TRUE );
+		::EnableWindow( GetItemHwnd( IDC_CHECK_CP ), FALSE );
+		CCodePage::AddComboCodePages( GetHwnd(), m_hwndCharSet, -1 );
 		return TRUE;
 	case IDC_BUTTON_HELP:
 		/* 「文字コードセット設定」のヘルプ */
@@ -179,7 +176,6 @@ void CDlgSetCharSet::SetData( void )
 		}
 	}
 	if( -1 == nCurIdx ){
-		m_bCP = true;
 		::CheckDlgButton( GetHwnd(), IDC_CHECK_CP, TRUE );
 		::EnableWindow( GetItemHwnd( IDC_CHECK_CP ), FALSE );
 		nCurIdx = CCodePage::AddComboCodePages( GetHwnd(), m_hwndCharSet, *m_pnCharSet );
diff --git a/sakura_core/dlg/CDlgSetCharSet.h b/sakura_core/dlg/CDlgSetCharSet.h
index b773ce30ee..839dcf3471 100644
--- a/sakura_core/dlg/CDlgSetCharSet.h
+++ b/sakura_core/dlg/CDlgSetCharSet.h
@@ -31,7 +31,6 @@ class CDlgSetCharSet : public CDialog
 
 	ECodeType*	m_pnCharSet;			// 文字コードセット
 	bool*		m_pbBom;				// BOM
-	bool		m_bCP;
 
 	HWND		m_hwndCharSet;
 	HWND		m_hwndCheckBOM;