diff options
| author | Markus Wick <markus+github@selfnet.de> | 2015-02-21 15:47:57 +0100 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2015-02-21 15:47:57 +0100 |
| commit | 95c48b2be70c4a6a2f7a187d74f72103d21850dc (patch) | |
| tree | 8bac905973cc46316e0166be885b4a68a4980096 /Source/Core/DolphinWX/ISOFile.cpp | |
| parent | 6bbf77450714df5fa2a379e20e483905ce8f3889 (diff) | |
| parent | b85a4ced9fd34b4220f25c1cf9cf3758f19e405a (diff) | |
Merge pull request #2018 from JosJuice/gameini-region-wildcard
Support game INIs that match all regions
Diffstat (limited to 'Source/Core/DolphinWX/ISOFile.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ISOFile.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index dd46734cd4..8587e62447 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -121,13 +121,9 @@ GameListItem::GameListItem(const std::string& _rFileName) if (IsValid()) { - IniFile ini; - ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + m_UniqueID + ".ini"); - ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_UniqueID + ".ini", true); - - IniFile::Section* emu_state = ini.GetOrCreateSection("EmuState"); - emu_state->Get("EmulationStateId", &m_emu_state); - emu_state->Get("EmulationIssues", &m_issues); + IniFile ini = SCoreStartupParameter::LoadGameIni(m_UniqueID, m_Revision); + ini.GetIfExists("EmuState", "EmulationStateId", &m_emu_state); + ini.GetIfExists("EmuState", "EmulationIssues", &m_issues); } if (!m_pImage.empty()) |