From 720f28c09c7eb9d4d2bb1d58c2fe1f5724bb7985 Mon Sep 17 00:00:00 2001
From: Federico Hernandez <ultrafredde@gmail.com>
Date: Sat, 16 Jan 2010 23:37:37 +0100
Subject: [PATCH] Clean up in Context.cpp

---
 src/Context.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 3d3d83494..683b08284 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -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;