piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 10:09:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8222 from JosJuice/allow-mismatched-region-settings

Browse Source 
Replace "Override Language on NTSC Games" with "Allow Mismatched Region Settings"
This commit is contained in:
Anthony
2019-08-21 09:00:06 -07:00
committed by GitHub
parent bf9427fafe 393709a45a
commit 5f38386575
23 changed files with 167 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/UICommon/GameFile.cpp
View File

@ -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
}