From 165c23c84844707249449826a8a18c25877e784b Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 24 Aug 2018 01:52:06 +0200 Subject: [PATCH] Port #4013 from Citra: "Init logging sooner so we dont miss some logs on startup" (#1142) * Port #4013 from Citra: "Init logging sooner so we dont miss some logs on startup" * Fix compilation --- src/yuzu/main.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index c62360bd4..98a41a725 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -91,9 +91,20 @@ void GMainWindow::ShowCallouts() {} const int GMainWindow::max_recent_files_item; +static void InitializeLogging() { + Log::Filter log_filter; + log_filter.ParseFilterString(Settings::values.log_filter); + Log::SetGlobalFilter(log_filter); + + const std::string& log_dir = FileUtil::GetUserPath(FileUtil::UserPath::LogDir); + FileUtil::CreateFullPath(log_dir); + Log::AddBackend(std::make_unique(log_dir + LOG_FILE)); +} + GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr), vfs(std::make_shared()) { + InitializeLogging(); debug_context = Tegra::DebugContext::Construct(); @@ -1173,16 +1184,6 @@ void GMainWindow::UpdateUITheme() { #undef main #endif -static void InitializeLogging() { - Log::Filter log_filter; - log_filter.ParseFilterString(Settings::values.log_filter); - Log::SetGlobalFilter(log_filter); - - const std::string& log_dir = FileUtil::GetUserPath(FileUtil::UserPath::LogDir); - FileUtil::CreateFullPath(log_dir); - Log::AddBackend(std::make_unique(log_dir + LOG_FILE)); -} - int main(int argc, char* argv[]) { MicroProfileOnThreadCreate("Frontend"); SCOPE_EXIT({ MicroProfileShutdown(); }); @@ -1200,7 +1201,6 @@ int main(int argc, char* argv[]) { GMainWindow main_window; // After settings have been loaded by GMainWindow, apply the filter - InitializeLogging(); main_window.show(); return app.exec(); }