X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSettings.cc;h=6883ddc4f852d3edd4191957e81529f87f155c8a;hp=624179ce36998c16efed54b1b75414f97c7d28b7;hb=8ad81a8282ce6e9e488a453e6bcd05fbc09715dc;hpb=50c1239917f5e443b8ec91773c85ceb3db7da67b

diff --git a/src/Moof/Settings.cc b/src/Moof/Settings.cc
index 624179c..6883ddc 100644
--- a/src/Moof/Settings.cc
+++ b/src/Moof/Settings.cc
@@ -32,6 +32,7 @@
 
 #include <boost/algorithm/string.hpp>
 
+#include "Log.hh"
 #include "Settings.hh"
 
 
@@ -104,7 +105,7 @@ void Settings::loadFromFiles(const std::vector<std::string>& filePaths,
 
 		if (home)
 		{
-			boost::replace_first(path, "$HOME", home);
+			boost::replace_all(path, "$HOME", home);
 		}
 
 		try
@@ -129,8 +130,8 @@ void Settings::loadFromFiles(const std::vector<std::string>& filePaths,
 		}
 		catch (Deserializer::Exception e)
 		{
-			std::cerr << "Cannot load settings from " << *it <<
-				" because an exception was thrown: " << e.what() << std::endl;
+			logWarning("cannot load settings from %s because an exception was"
+					"thrown: %s", (*it).c_str(), e.what());
 		}
 	}
 }