X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMainLayer.cc;h=ad2dbbc5f22d9a607f69327783032eee338c4236;hp=5f097ea9438a5cd8e9bd9cd6b8721b3c0f2e991b;hb=be9ebc1104574e5e81e19c5caba0c23b54df826d;hpb=4f62ce947db282f0bbf4d49b3aafb83d7cf51adc

diff --git a/src/MainLayer.cc b/src/MainLayer.cc
index 5f097ea..ad2dbbc 100644
--- a/src/MainLayer.cc
+++ b/src/MainLayer.cc
@@ -289,17 +289,6 @@ int main(int argc, char* argv[])
 	}
 
 
-#if	    YOINK_LOGLEVEL >= 3
-	Mf::Log::setLevel(Mf::Log::INFO);
-#elif	YOINK_LOGLEVEL >= 2
-	Mf::Log::setLevel(Mf::Log::WARNING);
-#elif	YOINK_LOGLEVEL >= 1
-	Mf::Log::setLevel(Mf::Log::ERROR);
-#elif	YOINK_LOGLEVEL
-	Mf::Log::setLevel(Mf::Log::NONE);
-#endif
-
-
 	// Add search paths; they should be searched in this order:
 	// 1. YOINK_DATADIR (environment)
 	// 2. YOINK_DATADIR (configure)
@@ -319,9 +308,7 @@ int main(int argc, char* argv[])
 	// 3. $HOME/.yoinkrc
 	// 4. YOINKRC (environment)
 
-	std::string configFiles;
-
-	configFiles += Mf::Resource::getPath("yoinkrc");
+	std::string configFiles = Mf::Resource::getPath("yoinkrc");
 #if !defined(_WIN32) && !defined(__WIN32__)
 	configFiles += ":/etc/yoinkrc";
 #endif
@@ -337,6 +324,10 @@ int main(int argc, char* argv[])
 	Mf::Settings& settings = Mf::Settings::getInstance();
 	settings.loadFromFile(configFiles);
 	settings.parseArgs(argc, argv);
+
+	Mf::Log::Level logLevel;
+	if (settings.get("loglevel", logLevel)) Mf::Log::setLevel(logLevel);
+
 	Mf::engine.initWithSettings(settings);
 
 	std::string iconFile = Mf::Resource::getPath(PACKAGE".png");