1 files changed, 3 insertions, 5 deletions
diff --git a/src/Common/ConfigManager.cpp b/src/Common/ConfigManager.cpp
index 487e901..c119cf7 100644
--- a/src/Common/ConfigManager.cpp
+++ b/src/Common/ConfigManager.cpp
@@ -49,7 +49,7 @@ void ConfigManager::handleConfigEntry(const ConfigEntry &entry) {
   }
 
   if(!handled)
-    Logger::logf(Logger::WARNING, "Invalid config option '%s'.", entry[0].getKey().c_str());
+    Logger::logf(Logger::WARNING, "Invalid config option '%s'.", entry[entry.getSize()-1].getKey().c_str());
 }
 
 bool ConfigManager::loadFile(const std::string &filename, bool finish) {
@@ -72,7 +72,7 @@ bool ConfigManager::loadFile(const std::string &filename, bool finish) {
     size_t pos = input.find_first_of("#{}");
     if(pos == std::string::npos) {
       line += input;
-      delim = 0;
+      delim = '\n';
       input.clear();
     }
     else {
@@ -82,9 +82,7 @@ bool ConfigManager::loadFile(const std::string &filename, bool finish) {
     }
 
     if(!Tokenizer::tokenize(line, splitLine)) {
-      if(delim)
-        line += delim;
-
+      line += delim;
       continue;
     }