mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu.git
				synced 2025-05-12 00:45:25 +00:00 
			
		
		
		
	Add support for disabling log from settings
This commit is contained in:
		
							parent
							
								
									ae311eb3ef
								
							
						
					
					
						commit
						371b61f3ea
					
				@ -5,6 +5,7 @@
 | 
			
		||||
#include "common/common.h"
 | 
			
		||||
#include "common/log_manager.h"
 | 
			
		||||
 | 
			
		||||
#include "core/settings.h"
 | 
			
		||||
#include "core/system.h"
 | 
			
		||||
#include "core/core.h"
 | 
			
		||||
#include "core/loader/loader.h"
 | 
			
		||||
@ -22,6 +23,9 @@ int __cdecl main(int argc, char **argv) {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    Config config;
 | 
			
		||||
    
 | 
			
		||||
    if (!Settings::values.enable_log)
 | 
			
		||||
        LogManager::Shutdown();
 | 
			
		||||
 | 
			
		||||
    std::string boot_filename = argv[1];
 | 
			
		||||
    EmuWindow_GLFW* emu_window = new EmuWindow_GLFW;
 | 
			
		||||
 | 
			
		||||
@ -59,10 +59,15 @@ void Config::ReadData() {
 | 
			
		||||
    Settings::values.use_virtual_sd = glfw_config->GetBoolean("Data Storage", "use_virtual_sd", true);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void Config::ReadMiscellaneous() {
 | 
			
		||||
    Settings::values.enable_log = glfw_config->GetBoolean("Miscellaneous", "enable_log", true);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void Config::Reload() {
 | 
			
		||||
    LoadINI(glfw_config, glfw_config_loc.c_str(), DefaultINI::glfw_config_file);
 | 
			
		||||
    ReadControls();
 | 
			
		||||
    ReadData();
 | 
			
		||||
    ReadMiscellaneous();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
Config::~Config() {
 | 
			
		||||
 | 
			
		||||
@ -17,6 +17,7 @@ class Config {
 | 
			
		||||
    bool LoadINI(INIReader* config, const char* location, const std::string& default_contents="", bool retry=true);
 | 
			
		||||
    void ReadControls();
 | 
			
		||||
    void ReadData();
 | 
			
		||||
    void ReadMiscellaneous();
 | 
			
		||||
public:
 | 
			
		||||
    Config();
 | 
			
		||||
    ~Config();
 | 
			
		||||
 | 
			
		||||
@ -28,6 +28,9 @@ pad_sright =
 | 
			
		||||
 | 
			
		||||
[Data Storage]
 | 
			
		||||
use_virtual_sd =
 | 
			
		||||
 | 
			
		||||
[Miscellaneous]
 | 
			
		||||
enable_log =
 | 
			
		||||
)";
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -76,14 +76,28 @@ void Config::SaveData() {
 | 
			
		||||
    qt_config->endGroup();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void Config::ReadMiscellaneous() {
 | 
			
		||||
    qt_config->beginGroup("Miscellaneous");
 | 
			
		||||
    Settings::values.enable_log = qt_config->value("enable_log", true).toBool();
 | 
			
		||||
    qt_config->endGroup();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void Config::SaveMiscellaneous() {
 | 
			
		||||
    qt_config->beginGroup("Miscellaneous");
 | 
			
		||||
    qt_config->setValue("enable_log", Settings::values.enable_log);
 | 
			
		||||
    qt_config->endGroup();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void Config::Reload() {
 | 
			
		||||
    ReadControls();
 | 
			
		||||
    ReadData();
 | 
			
		||||
    ReadMiscellaneous();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void Config::Save() {
 | 
			
		||||
    SaveControls();
 | 
			
		||||
    SaveData();
 | 
			
		||||
    SaveMiscellaneous();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
Config::~Config() {
 | 
			
		||||
 | 
			
		||||
@ -17,6 +17,9 @@ class Config {
 | 
			
		||||
 | 
			
		||||
    void ReadData();
 | 
			
		||||
    void SaveData();
 | 
			
		||||
 | 
			
		||||
    void ReadMiscellaneous();
 | 
			
		||||
    void SaveMiscellaneous();
 | 
			
		||||
public:
 | 
			
		||||
    Config();
 | 
			
		||||
    ~Config();
 | 
			
		||||
 | 
			
		||||
@ -22,6 +22,7 @@
 | 
			
		||||
#include "debugger/graphics.hxx"
 | 
			
		||||
#include "debugger/graphics_cmdlists.hxx"
 | 
			
		||||
 | 
			
		||||
#include "core/settings.h"
 | 
			
		||||
#include "core/system.h"
 | 
			
		||||
#include "core/core.h"
 | 
			
		||||
#include "core/loader/loader.h"
 | 
			
		||||
@ -34,8 +35,12 @@
 | 
			
		||||
GMainWindow::GMainWindow()
 | 
			
		||||
{
 | 
			
		||||
    LogManager::Init();
 | 
			
		||||
 | 
			
		||||
    Config config;
 | 
			
		||||
 | 
			
		||||
    if (!Settings::values.enable_log)
 | 
			
		||||
        LogManager::Shutdown();
 | 
			
		||||
 | 
			
		||||
    ui.setupUi(this);
 | 
			
		||||
    statusBar()->hide();
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -26,6 +26,8 @@ struct Values {
 | 
			
		||||
    int pad_sright_key;
 | 
			
		||||
 | 
			
		||||
    bool use_virtual_sd;
 | 
			
		||||
 | 
			
		||||
    bool enable_log;
 | 
			
		||||
} extern values;
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user