X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FSettings.cc;h=81b5c50fd62d7b6d34ec740b15b7eb23f09a6800;hb=d11d8c63ab52c7f6eca2815e47cd6401e72f2c8c;hp=53cb850f5a6f1cc661057ca4c6f10d4e5a31b3b2;hpb=ca0f7bdfba63140dca0bd20586d31980f3938eb2;p=chaz%2Fyoink

diff --git a/src/Moof/Settings.cc b/src/Moof/Settings.cc
index 53cb850..81b5c50 100644
--- a/src/Moof/Settings.cc
+++ b/src/Moof/Settings.cc
@@ -46,7 +46,7 @@ void Settings::parseArgs(int argc, char* argv[])
 {
 	for (int i = 1; i < argc; ++i)
 	{
-		script_.doString(argv[i]);
+		mScript.doString(argv[i]);
 	}
 }
 
@@ -74,17 +74,23 @@ void Settings::loadFromFiles(const std::vector<std::string>& filePaths)
 			boost::replace_all(path, "$HOME", home);
 		}
 
-		if (script_.doFile(path) != Script::SUCCESS)
+		if (mScript.doFile(path) != Script::SUCCESS)
 		{
 			std::string str;
-			script_[-1].get(str);
-			logWarning("running config file: %s", str.c_str());
-			script_.clear();
+			mScript[-1].get(str);
+			logScript("%s", str.c_str());
+			mScript.clear();
 		}
 	}
 }
 
 
+void Settings::clear()
+{
+	mScript.reset();
+}
+
+
 } // namepsace Mf
 
 /** vim: set ts=4 sw=4 tw=80: *************************************************/