From 100c433261c3b7ae4ee3ece3cbaf0cbfbba584e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@innovatetechnologi.es>
Date: Tue, 13 Jun 2017 14:30:53 +0200
Subject: [PATCH] Logging: Move verbosity setting code to LogManager

No clue why it was in DolphinWX.
---
 Source/Core/Common/Logging/LogManager.cpp | 11 +++++++++++
 Source/Core/DolphinWX/LogWindow.cpp       | 12 ------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp
index 2c09bc5051..b982509090 100644
--- a/Source/Core/Common/Logging/LogManager.cpp
+++ b/Source/Core/Common/Logging/LogManager.cpp
@@ -103,11 +103,22 @@ LogManager::LogManager()
   options->Get("WriteToFile", &write_file, false);
   options->Get("WriteToConsole", &write_console, true);
 
+  // Set up log listeners
+  int verbosity;
+  options->Get("Verbosity", &verbosity, 0);
+
+  // Ensure the verbosity level is valid
+  if (verbosity < 1)
+    verbosity = 1;
+  if (verbosity > MAX_LOGLEVEL)
+    verbosity = MAX_LOGLEVEL;
+
   for (LogContainer* container : m_Log)
   {
     bool enable;
     logs->Get(container->GetShortName(), &enable, false);
     container->SetEnable(enable);
+    container->SetLevel(static_cast<LogTypes::LOG_LEVELS>(verbosity));
     if (enable && write_file)
       container->AddListener(LogListener::FILE_LISTENER);
     if (enable && write_console)
diff --git a/Source/Core/DolphinWX/LogWindow.cpp b/Source/Core/DolphinWX/LogWindow.cpp
index 81817edba3..3f3107692e 100644
--- a/Source/Core/DolphinWX/LogWindow.cpp
+++ b/Source/Core/DolphinWX/LogWindow.cpp
@@ -61,16 +61,6 @@ void CLogWindow::CreateGUIControls()
   log_window->Get("y", &y, Parent->GetSize().GetY());
   log_window->Get("pos", &winpos, wxAUI_DOCK_RIGHT);
 
-  // Set up log listeners
-  int verbosity;
-  options->Get("Verbosity", &verbosity, 0);
-
-  // Ensure the verbosity level is valid
-  if (verbosity < 1)
-    verbosity = 1;
-  if (verbosity > MAX_LOGLEVEL)
-    verbosity = MAX_LOGLEVEL;
-
   // Get the logger output settings from the config ini file.
   options->Get("WriteToFile", &m_writeFile, false);
   options->Get("WriteToWindow", &m_writeWindow, true);
@@ -90,8 +80,6 @@ void CLogWindow::CreateGUIControls()
       m_LogManager->AddListener((LogTypes::LOG_TYPE)i, LogListener::FILE_LISTENER);
     else
       m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, LogListener::FILE_LISTENER);
-
-    m_LogManager->SetLogLevel((LogTypes::LOG_TYPE)i, (LogTypes::LOG_LEVELS)(verbosity));
   }
   m_has_listeners = true;