mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu-mainline.git
				synced 2025-03-21 01:53:15 +00:00 
			
		
		
		
	* Port #4013 from Citra: "Init logging sooner so we dont miss some logs on startup" * Fix compilation
This commit is contained in:
		
							parent
							
								
									5049ca5d8c
								
							
						
					
					
						commit
						165c23c848
					
				@ -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::FileBackend>(log_dir + LOG_FILE));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
GMainWindow::GMainWindow()
 | 
			
		||||
    : config(new Config()), emu_thread(nullptr),
 | 
			
		||||
      vfs(std::make_shared<FileSys::RealVfsFilesystem>()) {
 | 
			
		||||
    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::FileBackend>(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();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user