Clean up in Context.cpp

This commit is contained in:
Federico Hernandez 2010-01-16 23:37:37 +01:00
parent a6875ced6e
commit 720f28c09c

View file

@ -387,7 +387,6 @@ void Context::loadCorrectConfigFile ()
// Load rc file.
config.clear (); // Dump current values.
config.setDefaults (); // Add in the custom reports.
config.load (rc.data); // Load new file.
if (config.get ("data.location") != "")
@ -426,10 +425,11 @@ void Context::loadCorrectConfigFile ()
// Create data location, if necessary.
config.createDefaultData (data.data);
// TODO find out why this was done twice - see tw #355
// Load rc file.
config.clear (); // Dump current values.
config.setDefaults (); // Add in the custom reports.
config.load (rc.data); // Load new file.
//config.clear (); // Dump current values.
//config.setDefaults (); // Add in the custom reports.
//config.load (rc.data); // Load new file.
// Apply overrides of type: "rc.name:value", or "rc.name=value".
std::vector <std::string> filtered;