From fe3eed59cc2a5e3e55f057fb1f8a00f78ec2fa1c Mon Sep 17 00:00:00 2001 From: kichik Date: Wed, 28 Aug 2002 21:13:54 +0000 Subject: [PATCH] $LANGUAGE not set bug fixed git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@796 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/exehead/Ui.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c index cfb94ec2..cea9a16d 100644 --- a/Source/exehead/Ui.c +++ b/Source/exehead/Ui.c @@ -248,12 +248,11 @@ static void NSISCALL CheckTreeItem(HWND hWnd, TV_ITEM *pItem, int checked) { static int lang_num; -static void NSISCALL set_language(LANGID lang) +static void NSISCALL set_language() { int i; LANGID lang_mask=~(LANGID)0; - - if (!lang) lang=myatoi(state_language); + LANGID lang=myatoi(state_language); lang_again: for (i = 0; i < lang_num; i++) { @@ -360,7 +359,8 @@ int NSISCALL ui_doinstall(void) cur_install_strings_table=install_strings_tables=(char *)GlobalAlloc(GPTR,size); GetCompressedDataFromDataBlockToMemory(g_inst_header->common.inst_str_tables,install_strings_tables,size); - set_language(GetUserDefaultLangID()); + myitoa(state_language, GetUserDefaultLangID()); + set_language(); } #ifdef NSIS_CONFIG_VISIBLE_SUPPORT @@ -379,7 +379,7 @@ int NSISCALL ui_doinstall(void) g_hwnd=m_bgwnd; // Select language if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1; - set_language(0); + set_language(); g_hwnd=NULL; ShowWindow(m_bgwnd, SW_SHOW); #endif//NSIS_SUPPORT_CODECALLBACKS @@ -393,7 +393,7 @@ int NSISCALL ui_doinstall(void) { #ifdef NSIS_SUPPORT_CODECALLBACKS if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1; - set_language(0); + set_language(); #endif//NSIS_SUPPORT_CODECALLBACKS if (install_thread(NULL)) {