From: Takashi Sawanaka Date: Fri, 4 Nov 2022 13:59:49 +0000 (+0900) Subject: Fix the problem that the "According to WinMerge User Interface" option in the Codepag... X-Git-Tag: 2.16.24+jp-2~5^2~32 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=480fb37e2ca894a7165fbe599fd8d6aa002c6bbd;p=winmerge-jp%2Fwinmerge-jp.git Fix the problem that the "According to WinMerge User Interface" option in the Codepage category of the Options dialog would always result in the codepage being 1252. --- diff --git a/Src/Merge.cpp b/Src/Merge.cpp index 66144f718..2de9fb8c5 100644 --- a/Src/Merge.cpp +++ b/Src/Merge.cpp @@ -322,6 +322,9 @@ BOOL CMergeApp::InitInstance() LoadStdProfileSettings(GetOptionsMgr()->GetInt(OPT_MRU_MAX)); // Load standard INI file options (including MRU) + // Initialize i18n (multiple language) support + m_pLangDlg->InitializeLanguage((WORD)GetOptionsMgr()->GetInt(OPT_SELECTED_LANGUAGE)); + charsets_init(); UpdateCodepageModule(); @@ -390,10 +393,6 @@ BOOL CMergeApp::InitInstance() m_bMergingMode = GetOptionsMgr()->GetBool(OPT_MERGE_MODE); - // Initialize i18n (multiple language) support - - m_pLangDlg->InitializeLanguage((WORD)GetOptionsMgr()->GetInt(OPT_SELECTED_LANGUAGE)); - m_mainThreadScripts = new CAssureScriptsForThread; // Register the application's document templates. Document templates