From 561a4cfcce363fae6cfbd958200a49d241fe0d26 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 30 Jun 2019 11:48:49 +0200 Subject: 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 --- Source/Core/UICommon/GameFile.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Source/Core/UICommon/GameFile.cpp') 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 } -- cgit v1.2.3