diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2013-09-17 16:31:51 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2013-09-17 16:50:44 +0200 |
| commit | e34d8aee1d3818e16281e990717fb82df49d447b (patch) | |
| tree | 24d6389118b262db31e988ac38153fd5c4d46dae /Source | |
| parent | 47ce3dd09d05bf19672ea20dad3d7e934cf84b32 (diff) | |
Add * to the characters leading a verbatim line (used in Gecko codes comments)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Common/Src/IniFile.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/ISOProperties.cpp | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/Common/Src/IniFile.cpp b/Source/Core/Common/Src/IniFile.cpp index f7d97cd607..a86e101b01 100644 --- a/Source/Core/Common/Src/IniFile.cpp +++ b/Source/Core/Common/Src/IniFile.cpp @@ -371,11 +371,11 @@ bool IniFile::Load(const char* filename, bool keep_current_data) std::string key, value; ParseLine(line, &key, &value); - // Lines starting with '$' or '+' are kept verbatim. Kind - // of a hack, but the support for raw lines inside an INI - // is a hack anyway. + // Lines starting with '$', '*' or '+' are kept verbatim. + // Kind of a hack, but the support for raw lines inside an + // INI is a hack anyway. if ((key == "" && value == "") - || (line.size() >= 1 && (line[0] == '$' || line[0] == '+'))) + || (line.size() >= 1 && (line[0] == '$' || line[0] == '+' || line[0] == '*'))) current_section->lines.push_back(line.c_str()); else current_section->Set(key, value.c_str()); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 0dc4f38b17..583aeea495 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -125,7 +125,6 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW GameIniFileDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + _iniFilename + ".ini"; GameIniFileLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + _iniFilename + ".ini"; - printf("Loading\n"); GameIniDefault.Load(GameIniFileDefault); GameIniLocal.Load(GameIniFileLocal); |