BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug in config file overriding. Previously it was silently overwriting the whole default config and relied on hardcoded values for defaults.

Browse Source
This commit is contained in:
sippeangelo
2015-12-11 10:58:32 +01:00
parent bffc97f310
commit 784a04b8ad
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Core/ConfigFile.cpp
+5 -2
View File
@@ -24,8 +24,11 @@ ConfigFile::ConfigFile(std::string path)
if (boost::filesystem::exists(m_Path)) { if (boost::filesystem::exists(m_Path)) {
try { try {
boost::property_tree::ini_parser::read_ini(m_Path.string(), m_PTreeOverrides); boost::property_tree::ini_parser::read_ini(m_Path.string(), m_PTreeOverrides);
for (auto& node : m_PTreeOverrides) { for (auto& topLevelNode : m_PTreeOverrides) {
m_PTreeMerged.put_child(node.first, node.second); auto& mergedTopLevelNode = m_PTreeMerged.find(topLevelNode.first);
for (auto& childOverrideNode : topLevelNode.second) {
mergedTopLevelNode->second.put_child(childOverrideNode.first, childOverrideNode.second);
}
} }
} catch (boost::property_tree::ptree_error& e) { } catch (boost::property_tree::ptree_error& e) {
LOG_ERROR("Failed to parse \"%s\":\n%s", m_Path.filename().string().c_str(), e.what()); LOG_ERROR("Failed to parse \"%s\":\n%s", m_Path.filename().string().c_str(), e.what());