summaryrefslogtreecommitdiff
path: root/Source/Core/UICommon/GameFile.cpp
diff options
context:
space:
mode:
authorAnthony <Helios747@users.noreply.github.com>2019-08-21 09:00:06 -0700
committerGitHub <noreply@github.com>2019-08-21 09:00:06 -0700
commit5f38386575948457a650afec25b2a32c2cab9247 (patch)
tree8915456807b0bdb914f2fbb402d8b465727fc491 /Source/Core/UICommon/GameFile.cpp
parentbf9427fafe6a69ba85f847a6615ed1f0d16dfdf0 (diff)
parent393709a45ae5591ab969a63914daa9feba70a2e4 (diff)
Merge pull request #8222 from JosJuice/allow-mismatched-region-settings
Replace "Override Language on NTSC Games" with "Allow Mismatched Region Settings"
Diffstat (limited to 'Source/Core/UICommon/GameFile.cpp')
-rw-r--r--Source/Core/UICommon/GameFile.cpp5
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
}