diff options
| author | JosJuice <josjuice@gmail.com> | 2018-06-08 13:59:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 13:59:45 +0200 |
| commit | ca3d68cee581435217fe737390a9fed833ac3338 (patch) | |
| tree | 2cf04a27469dd2955e4b1dc2facd7b64ee00fb66 /Source/Core/UICommon/GameFile.cpp | |
| parent | d23c3e9524e9f5aa312fae5d320f5866bb721a8a (diff) | |
| parent | f0f8ca21723470c859b58291144b7913dfae3906 (diff) | |
Merge pull request #7076 from JosJuice/android-gamelist-uicommon
Use UICommon's game list code on Android
Diffstat (limited to 'Source/Core/UICommon/GameFile.cpp')
| -rw-r--r-- | Source/Core/UICommon/GameFile.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/UICommon/GameFile.cpp b/Source/Core/UICommon/GameFile.cpp index 64d4740a0e..a666efdaa5 100644 --- a/Source/Core/UICommon/GameFile.cpp +++ b/Source/Core/UICommon/GameFile.cpp @@ -78,8 +78,15 @@ const std::string& GameFile::Lookup(DiscIO::Language language, const std::string& GameFile::LookupUsingConfigLanguage(const std::map<DiscIO::Language, std::string>& strings) const { +#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 + const DiscIO::Language language = DiscIO::Language::English; +#else const bool wii = DiscIO::IsWii(m_platform); - return Lookup(SConfig::GetInstance().GetCurrentLanguage(wii), strings); + const DiscIO::Language language = SConfig::GetInstance().GetCurrentLanguage(wii); +#endif + return Lookup(language, strings); } GameFile::GameFile(const std::string& path) |