diff options
| author | Markus Wick <markus@selfnet.de> | 2015-06-12 22:42:45 +0200 |
|---|---|---|
| committer | Markus Wick <markus@selfnet.de> | 2015-06-12 22:42:45 +0200 |
| commit | 740e34484704c64bf95b2143e9601a8834cbe8db (patch) | |
| tree | 4008bc8648422c51521a65b5209d0b641e9aea07 /Source/Core/DolphinWX/MainAndroid.cpp | |
| parent | 5ae1c07cd4a06f3738e461785bc364667dfd9129 (diff) | |
| parent | c375111076235313669e71953c877c9512cebd16 (diff) | |
Merge pull request #2594 from degasus/master
Options: merge SCoreStartupParameter into SConfig
Diffstat (limited to 'Source/Core/DolphinWX/MainAndroid.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/MainAndroid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index 1389abdcee..e6d6925f1b 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -226,7 +226,7 @@ static std::string GetTitle(std::string filename) /* bool is_wii_title = pVolume->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC; - DiscIO::IVolume::ELanguage language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(is_wii_title); + DiscIO::IVolume::ELanguage language = SConfig::GetInstance().GetCurrentLanguage(is_wii_title); auto it = titles.find(language); if (it != end) @@ -267,7 +267,7 @@ static std::string GetDescription(std::string filename) /* bool is_wii_title = pVolume->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC; - DiscIO::IVolume::ELanguage language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(is_wii_title); + DiscIO::IVolume::ELanguage language = SConfig::GetInstance().GetCurrentLanguage(is_wii_title); auto it = descriptions.find(language); if (it != end) |