diff options
| author | spxtr <spextear@gmail.com> | 2015-12-20 15:36:39 -0800 |
|---|---|---|
| committer | spxtr <spextear@gmail.com> | 2015-12-20 15:36:39 -0800 |
| commit | 3a4a60f937373f48324328f3f5580b8ffcf2aeed (patch) | |
| tree | 3abc2e5cecf5a456e6fe6fe8bc05051fed8e162d /Source/Core/DolphinQt2/GameList/GameFile.cpp | |
| parent | 2842897d55d4d6dbf75fd7f6827d440377d00fb7 (diff) | |
Use a separate INI file for UI settings.
Diffstat (limited to 'Source/Core/DolphinQt2/GameList/GameFile.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/GameList/GameFile.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Source/Core/DolphinQt2/GameList/GameFile.cpp b/Source/Core/DolphinQt2/GameList/GameFile.cpp index 6a0920e17e..e5419ae7d7 100644 --- a/Source/Core/DolphinQt2/GameList/GameFile.cpp +++ b/Source/Core/DolphinQt2/GameList/GameFile.cpp @@ -14,6 +14,7 @@ #include "Core/ConfigManager.h" #include "DiscIO/VolumeCreator.h" #include "DolphinQt2/Resources.h" +#include "DolphinQt2/Settings.h" #include "DolphinQt2/GameList/GameFile.h" static const int CACHE_VERSION = 13; // Last changed in PR #3261 @@ -50,12 +51,6 @@ GameFile::GameFile(QString path) : m_path(path) m_valid = true; } -DiscIO::IVolume::ELanguage GameFile::GetDefaultLanguage() const -{ - bool wii = m_platform != DiscIO::IVolume::GAMECUBE_DISC; - return SConfig::GetInstance().GetCurrentLanguage(wii); -} - QString GameFile::GetCacheFileName() const { QString folder = QString::fromStdString(File::GetUserPath(D_CACHE_IDX)); @@ -194,7 +189,14 @@ QString GameFile::GetLanguageString(QMap<DiscIO::IVolume::ELanguage, QString> m) // Try the settings language, then English, then just pick one. if (m.isEmpty()) return QString(); - DiscIO::IVolume::ELanguage current_lang = GetDefaultLanguage(); + + bool wii = m_platform != DiscIO::IVolume::GAMECUBE_DISC; + DiscIO::IVolume::ELanguage current_lang; + if (wii) + current_lang = Settings().GetWiiSystemLanguage(); + else + current_lang = Settings().GetGCSystemLanguage(); + if (m.contains(current_lang)) return m[current_lang]; if (m.contains(DiscIO::IVolume::LANGUAGE_ENGLISH)) |
