diff options
| author | JosJuice <josjuice@gmail.com> | 2019-06-30 11:48:49 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2019-08-09 17:33:05 +0200 |
| commit | 561a4cfcce363fae6cfbd958200a49d241fe0d26 (patch) | |
| tree | e05a371eedf95dfbbb88c7a2cc129be8542dc429 /Source/Core/UICommon/GameFile.cpp | |
| parent | b88e5610ab7db20aeda240a22f6223fa9cc905c6 (diff) | |
Replace "Override Language on NTSC Games" with "Allow Mismatched Region Settings"
This new setting is like Override Language on NTSC Games, except
instead of only applying to the GameCube language setting,
it also applies to the Wii language setting.
Fixes https://bugs.dolphin-emu.org/issues/11299
Diffstat (limited to 'Source/Core/UICommon/GameFile.cpp')
| -rw-r--r-- | Source/Core/UICommon/GameFile.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/Core/UICommon/GameFile.cpp b/Source/Core/UICommon/GameFile.cpp index 5431face3a..89d38e24f5 100644 --- a/Source/Core/UICommon/GameFile.cpp +++ b/Source/Core/UICommon/GameFile.cpp @@ -61,15 +61,12 @@ bool UseGameCovers() DiscIO::Language GameFile::GetConfigLanguage() const { - if (m_platform == DiscIO::Platform::GameCubeDisc && m_country == DiscIO::Country::Japan) - return DiscIO::Language::Japanese; - #ifdef ANDROID // TODO: Make the Android app load the config at app start instead of emulation start // so that we can access the user's preference here return DiscIO::Language::English; #else - return SConfig::GetInstance().GetCurrentLanguage(DiscIO::IsWii(m_platform)); + return SConfig::GetInstance().GetLanguageAdjustedForRegion(DiscIO::IsWii(m_platform), m_region); #endif } |