[Scummvm-git-logs] scummvm master -> 0f93962ef4bc43827f878d31a2c0ae3b868276f6
sev-
sev at scummvm.org
Tue Aug 1 08:55:54 CEST 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
0f93962ef4 Windows: Use GetUserDefaultUILanguage() instead of GetThreadLocale().
Commit: 0f93962ef4bc43827f878d31a2c0ae3b868276f6
https://github.com/scummvm/scummvm/commit/0f93962ef4bc43827f878d31a2c0ae3b868276f6
Author: Frank Richter (frank.richter at gmail.com)
Date: 2017-08-01T08:55:48+02:00
Commit Message:
Windows: Use GetUserDefaultUILanguage() instead of GetThreadLocale().
The thread locale concerns display options (e.g. date formatting) not
the display language. There are typically, but not necessarily the same,
as Windows allows them to be configured separately.
Changed paths:
backends/platform/sdl/sdl.cpp
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 9a5db7f..bbd5c89 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -432,7 +432,7 @@ Common::String OSystem_SDL::getSystemLanguage() const {
char langName[9];
char ctryName[9];
- const LCID languageIdentifier = GetThreadLocale();
+ const LCID languageIdentifier = GetUserDefaultUILanguage();
if (GetLocaleInfo(languageIdentifier, LOCALE_SISO639LANGNAME, langName, sizeof(langName)) != 0 &&
GetLocaleInfo(languageIdentifier, LOCALE_SISO3166CTRYNAME, ctryName, sizeof(ctryName)) != 0) {
More information about the Scummvm-git-logs
mailing list