summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorMat M <mathew1800@gmail.com>2017-04-01 18:01:28 -0400
committerGitHub <noreply@github.com>2017-04-01 18:01:28 -0400
commita65a1767779b448db15ef5ccd3b2c11f79af6480 (patch)
tree874bb236ca4a7aac3cf22e44f760c6e49b37dba8 /Source
parent22fa199caf7f905007c94e52b0e6d6feb1f41f99 (diff)
parent92ad1b9c4db65c4b5ff5879063a071a637e9930c (diff)
Merge pull request #5192 from vtj/geckofix
Fix disappearing gecko codes
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/GeckoCodeConfig.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp
index 8cae3d8b68..541537f3a4 100644
--- a/Source/Core/Core/GeckoCodeConfig.cpp
+++ b/Source/Core/Core/GeckoCodeConfig.cpp
@@ -17,10 +17,10 @@ std::vector<GeckoCode> LoadCodes(const IniFile& globalIni, const IniFile& localI
{
std::vector<GeckoCode> gcodes;
- for (const IniFile& ini : {globalIni, localIni})
+ for (const IniFile* ini : {&globalIni, &localIni})
{
std::vector<std::string> lines;
- ini.GetLines("Gecko", &lines, false);
+ ini->GetLines("Gecko", &lines, false);
GeckoCode gcode;
@@ -42,7 +42,7 @@ std::vector<GeckoCode> LoadCodes(const IniFile& globalIni, const IniFile& localI
gcodes.push_back(gcode);
gcode = GeckoCode();
gcode.enabled = (1 == ss.tellg()); // silly
- gcode.user_defined = (&ini == &localIni);
+ gcode.user_defined = (ini == &localIni);
ss.seekg(1, std::ios_base::cur);
// read the code name
std::getline(ss, gcode.name, '['); // stop at [ character (beginning of contributor name)
@@ -75,7 +75,7 @@ std::vector<GeckoCode> LoadCodes(const IniFile& globalIni, const IniFile& localI
gcodes.push_back(gcode);
}
- ini.GetLines("Gecko_Enabled", &lines, false);
+ ini->GetLines("Gecko_Enabled", &lines, false);
for (const std::string& line : lines)
{