Merge with 435981ea6ae030a50fbbbffb03f5402bdcced076

1 files changed, 4 insertions, 3 deletions

diff --git a/src/Common/Logger.cpp b/src/Common/Logger.cpp
index 199688d..859a77d 100644
--- a/src/Common/Logger.cpp
+++ b/src/Common/Logger.cpp
@@ -55,8 +55,9 @@ void Logger::logfv(MessageCategory category, MessageLevel level, const char *for
 }
 
 void Logger::log(MessageCategory category, MessageLevel level, const std::string &message) {
+  //TODO Category
   for(std::list<Logger*>::iterator logger = loggers.begin(); logger != loggers.end(); ++logger) {
-    if((*logger)->getLevel() >= level && (*logger)->getCategory() == category)
+    if((*logger)->getLevel() >= level && (*logger)->isCategorySet(category))
       (*logger)->logMessage(category, level, message);
   }
 }
@@ -73,7 +74,7 @@ void Logger::logf(MessageLevel level, const char *format, ...) {
   va_list ap;
 
   va_start(ap, format);
-  logfv(ALL, level, format, ap);
+  logfv(GENERAL, level, format, ap);
   va_end(ap);
 }
 
@@ -81,7 +82,7 @@ void Logger::logf(const char *format, ...) {
   va_list ap;
 
   va_start(ap, format);
-  logfv(ALL, DEFAULT, format, ap);
+  logfv(GENERAL, DEFAULT, format, ap);
   va_end(ap);
 }