From f5a765e86088eb90c4392e43ad8a3c27bfa814cc Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 22 Aug 2018 23:59:51 +0200 Subject: Windows: fix language selected in the installer not used by "Create Volume" wizard until reboot or exiting VeraCrypt main process. --- src/Common/Dlgcode.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/Common/Dlgcode.c') diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c index 3fd6e768..ee598cf0 100644 --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c @@ -2877,6 +2877,9 @@ void InitApp (HINSTANCE hInstance, wchar_t *lpszCommandLine) char langId[6]; InitCommonControlsPtr InitCommonControlsFn = NULL; wchar_t modPath[MAX_PATH]; +#ifndef SETUP + BOOL bLanguageSetInSetup = FALSE; +#endif GetModuleFileNameW (NULL, modPath, ARRAYSIZE (modPath)); @@ -3046,6 +3049,7 @@ void InitApp (HINSTANCE hInstance, wchar_t *lpszCommandLine) if (0 < WideCharToMultiByte (CP_ACP, 0, uiLang, -1, langId, sizeof (langId), NULL, NULL)) { SetPreferredLangId (langId); + bLanguageSetInSetup = TRUE; } } @@ -3073,6 +3077,11 @@ void InitApp (HINSTANCE hInstance, wchar_t *lpszCommandLine) LoadLanguageFile (); #ifndef SETUP + // Save language to XML configuration file if it has been selected in the setup + // so that other VeraCrypt programs will pick it up + if (bLanguageSetInSetup) + SaveSettings (NULL); + // UAC elevation moniker cannot be used in portable mode. // A new instance of the application must be created with elevated privileges. if (IsNonInstallMode () && !IsAdmin () && IsUacSupported ()) -- cgit v1.2.3