80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Reinit media menu, and store the system language too

Browse Source
This commit is contained in:
Laci bá
2021-11-12 22:41:30 +01:00
parent b4f5ff7ad1
commit 0bab2e144a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/86box.h
View File

@@ -65,6 +65,8 @@ extern "C" {
#endif #endif
/* Global variables. */ /* Global variables. */
extern uint32_t lang_sys; /* (-) system language code */
extern int dump_on_exit; /* (O) dump regs on exit*/ extern int dump_on_exit; /* (O) dump regs on exit*/
extern int do_dump_config; /* (O) dump cfg after load */ extern int do_dump_config; /* (O) dump cfg after load */
extern int start_in_fullscreen; /* (O) start in fullscreen */ extern int start_in_fullscreen; /* (O) start in fullscreen */

13
src/win/win.c
View File

@@ -67,7 +67,7 @@ typedef struct {
/* Platform Public data, specific. */ /* Platform Public data, specific. */
HINSTANCE hinstance; /* application instance */ HINSTANCE hinstance; /* application instance */
HANDLE ghMutex; HANDLE ghMutex;
uint32_t lang_id; /* current language ID used */ uint32_t lang_id, lang_sys; /* current and system language ID */
DWORD dwSubLangID; DWORD dwSubLangID;
int acp_utf8; /* Windows supports UTF-8 codepage */ int acp_utf8; /* Windows supports UTF-8 codepage */
volatile int cpu_thread_run = 1; volatile int cpu_thread_run = 1;
@@ -260,10 +260,14 @@ set_language(uint32_t id)
lang_id = id; lang_id = id;
SetThreadUILanguage(lang_id); SetThreadUILanguage(lang_id);
SetMenu(hwndMain, LoadMenu(hinstance, L"MainMenu"));
/* Load the strings table for this ID. */ /* Load the strings table for this ID. */
LoadCommonStrings(); LoadCommonStrings();
/* Reload main menu */
SetMenu(hwndMain, LoadMenu(hinstance, L"MainMenu"));
/* Re-init media menu */
media_menu_init();
} }
} }
@@ -466,7 +470,8 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszArg, int nCmdShow)
sprintf(emu_version, "%s v%s", EMU_NAME, EMU_VERSION); sprintf(emu_version, "%s v%s", EMU_NAME, EMU_VERSION);
/* First, set our (default) language. */ /* First, set our (default) language. */
set_language(GetThreadUILanguage()); lang_sys = GetThreadUILanguage();
set_language(lang_sys);
/* Process the command line for options. */ /* Process the command line for options. */
argc = ProcessCommandLine(&argv); argc = ProcessCommandLine(&argv);