dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

$LANGUAGE not set bug fixed

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@796 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-08-28 21:13:54 +00:00
parent e33a4cdf32
commit fe3eed59cc
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/exehead/Ui.c
View file

@ -248,12 +248,11 @@ static void NSISCALL CheckTreeItem(HWND hWnd, TV_ITEM *pItem, int checked) {
static int lang_num; static int lang_num;
static void NSISCALL set_language(LANGID lang) static void NSISCALL set_language()
{ {
int i; int i;
LANGID lang_mask=~(LANGID)0; LANGID lang_mask=~(LANGID)0;
LANGID lang=myatoi(state_language);
if (!lang) lang=myatoi(state_language);
lang_again: lang_again:
for (i = 0; i < lang_num; i++) { 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); cur_install_strings_table=install_strings_tables=(char *)GlobalAlloc(GPTR,size);
GetCompressedDataFromDataBlockToMemory(g_inst_header->common.inst_str_tables,install_strings_tables,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 #ifdef NSIS_CONFIG_VISIBLE_SUPPORT
@ -379,7 +379,7 @@ int NSISCALL ui_doinstall(void)
g_hwnd=m_bgwnd; g_hwnd=m_bgwnd;
// Select language // Select language
if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1; if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1;
set_language(0); set_language();
g_hwnd=NULL; g_hwnd=NULL;
ShowWindow(m_bgwnd, SW_SHOW); ShowWindow(m_bgwnd, SW_SHOW);
#endif//NSIS_SUPPORT_CODECALLBACKS #endif//NSIS_SUPPORT_CODECALLBACKS
@ -393,7 +393,7 @@ int NSISCALL ui_doinstall(void)
{ {
#ifdef NSIS_SUPPORT_CODECALLBACKS #ifdef NSIS_SUPPORT_CODECALLBACKS
if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1; if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1;
set_language(0); set_language();
#endif//NSIS_SUPPORT_CODECALLBACKS #endif//NSIS_SUPPORT_CODECALLBACKS
if (install_thread(NULL)) if (install_thread(NULL))
{ {