From 480fb37e2ca894a7165fbe599fd8d6aa002c6bbd Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Fri, 4 Nov 2022 22:59:49 +0900 Subject: [PATCH] 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. --- Src/Merge.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 -- 2.11.0