Merge pull request #12685 from Rechi/fixComponentLogging

[utils] fix component log functions introduced at 06bbead

2 files changed, 4 insertions, 4 deletions

diff --git a/xbmc/input/InputManager.cpp b/xbmc/input/InputManager.cpp
index 0bdc8ca029..737396fb57 100644
--- a/xbmc/input/InputManager.cpp
+++ b/xbmc/input/InputManager.cpp
@@ -198,7 +198,7 @@ bool CInputManager::ProcessMouse(int windowId)
   // handled this mouse action
   if (!mouseaction.GetID())
   {
-    CLog::LogF(LOGDEBUG, LOGAUDIO, "unknown mouse command %d", mousekey);
+    CLog::LogF(LOGDEBUG, "unknown mouse command %d", mousekey);
     return false;
   }
 
diff --git a/xbmc/utils/log.cpp b/xbmc/utils/log.cpp
index 5d9bfd2ce0..e1a7280a24 100644
--- a/xbmc/utils/log.cpp
+++ b/xbmc/utils/log.cpp
@@ -60,11 +60,11 @@ void CLog::Log(int loglevel, PRINTF_FORMAT_STRING const char *format, ...)
 
 void CLog::Log(int loglevel, int component, PRINTF_FORMAT_STRING const char *format, ...)
 {
-  if (g_advancedSettings.CanLogComponent(component))
+  if (g_advancedSettings.CanLogComponent(component) && IsLogLevelLogged(loglevel))
   {
     va_list va;
     va_start(va, format);
-    CLog::Log(loglevel, format, va);
+    LogString(loglevel, StringUtils::FormatV(format, va));
     va_end(va);
   }
 }
@@ -89,7 +89,7 @@ void CLog::LogFunction(int loglevel, const char* functionName, int component, co
   {
     va_list va;
     va_start(va, format);
-    CLog::LogFunction(loglevel, functionName, format, va);
+    LogFunction(loglevel, functionName, StringUtils::FormatV(format, va).c_str());
     va_end(va);
   }
 }