summaryrefslogtreecommitdiffstats
path: root/src/citra/citra.cpp
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2014-12-06 23:00:08 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2014-12-13 05:08:06 +0100
commit0e0a007a2503d468391004c8ea2faae305232345 (patch)
tree75feea527bd46aa4c534b77b560c89d538757f7f /src/citra/citra.cpp
parentConvert old logging calls to new logging macros (diff)
downloadyuzu-0e0a007a2503d468391004c8ea2faae305232345.tar
yuzu-0e0a007a2503d468391004c8ea2faae305232345.tar.gz
yuzu-0e0a007a2503d468391004c8ea2faae305232345.tar.bz2
yuzu-0e0a007a2503d468391004c8ea2faae305232345.tar.lz
yuzu-0e0a007a2503d468391004c8ea2faae305232345.tar.xz
yuzu-0e0a007a2503d468391004c8ea2faae305232345.tar.zst
yuzu-0e0a007a2503d468391004c8ea2faae305232345.zip
Diffstat (limited to 'src/citra/citra.cpp')
-rw-r--r--src/citra/citra.cpp5
1 files changed, 4 insertions, 1 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;