3 files changed, 6 insertions, 3 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index d192428e9..d6e8a4ec7 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -7,6 +7,7 @@
 #include "common/common.h"
 #include "common/logging/text_formatter.h"
 #include "common/logging/backend.h"
+#include "common/logging/filter.h"
 #include "common/scope_exit.h"
 
 #include "core/settings.h"
@@ -20,7 +21,8 @@
 /// Application entry point
 int __cdecl main(int argc, char **argv) {
     std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger();
-    std::thread logging_thread(Log::TextLoggingLoop, logger);
+    Log::Filter log_filter(Log::Level::Debug);
+    std::thread logging_thread(Log::TextLoggingLoop, logger, &log_filter);
     SCOPE_EXIT({
         logger->Close();
         logging_thread.join();
@@ -32,6 +34,7 @@ int __cdecl main(int argc, char **argv) {
     }
 
     Config config;
+    log_filter.ParseFilterString(Settings::values.log_filter);
 
     std::string boot_filename = argv[1];
     EmuWindow_GLFW* emu_window = new EmuWindow_GLFW;
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index fe0ebe5a8..92764809e 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -64,7 +64,7 @@ void Config::ReadValues() {
     Settings::values.use_virtual_sd = glfw_config->GetBoolean("Data Storage", "use_virtual_sd", true);
 
     // Miscellaneous
-    Settings::values.enable_log = glfw_config->GetBoolean("Miscellaneous", "enable_log", true);
+    Settings::values.log_filter = glfw_config->Get("Miscellaneous", "log_filter", "*:Info");
 }
 
 void Config::Reload() {
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index f1f626eed..7cf543e07 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -34,7 +34,7 @@ gpu_refresh_rate = ## 60 (default)
 use_virtual_sd =
 
 [Miscellaneous]
-enable_log =
+log_filter = *:Info  ## Examples: *:Debug Kernel.SVC:Trace Service.*:Critical
 )";
 
 }