Create/Update category defaults for ServiceName_FilterName
FOGL:2466: filters configuration merge not working correctly
fix code formatting
@@ -172,8 +172,8 @@ bool FilterPipeline::loadFilters(const string& categoryName)
// Get plugin default configuration
string filterConfig = pluginManager->getInfo(itr->second)->config;
- // Update filter category items
- DefaultConfigCategory filterDefConfig(itr->first, filterConfig);
+ // Create/Update default filter category items
+ DefaultConfigCategory filterDefConfig(categoryName + "_" + itr->first, filterConfig);
string filterDescription = "Configuration of '" + itr->first;
filterDescription += "' filter for plugin '" + categoryName + "'";
filterDefConfig.setDescription(filterDescription);
@@ -197,6 +197,7 @@ bool FilterPipeline::loadFilters(const string& categoryName)
}
}
}
+
/*
* Put all the new catregories in the Filter category parent
* Create an empty South category if one doesn't exist
