diff options
author | Tony Wasserka <neobrainx@gmail.com> | 2014-11-15 12:42:08 +0100 |
---|---|---|
committer | Tony Wasserka <neobrainx@gmail.com> | 2014-11-15 12:42:08 +0100 |
commit | 80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15 (patch) | |
tree | ae06f0da5ace2aabd76d2e653c0e6db3f626e123 /src/citra | |
parent | 26622818aea65134812fb0055f38b9b9ab5a2672 (diff) | |
parent | 371b61f3eaf6ad8bc35311d906c8d780d1531f8b (diff) |
Merge pull request #159 from SeannyM/enable_log
Add support for disabling log from settings
Diffstat (limited to 'src/citra')
-rw-r--r-- | src/citra/citra.cpp | 4 | ||||
-rw-r--r-- | src/citra/config.cpp | 5 | ||||
-rw-r--r-- | src/citra/config.h | 1 | ||||
-rw-r--r-- | src/citra/default_ini.h | 3 |
4 files changed, 13 insertions, 0 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 6ac5c5dc..41b62ac1 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -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; diff --git a/src/citra/config.cpp b/src/citra/config.cpp index c5ce8a16..f45d09fc 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -65,11 +65,16 @@ 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(); ReadCore(); ReadData(); + ReadMiscellaneous(); } Config::~Config() { diff --git a/src/citra/config.h b/src/citra/config.h index 4f655187..19bb8370 100644 --- a/src/citra/config.h +++ b/src/citra/config.h @@ -18,6 +18,7 @@ class Config { void ReadControls(); void ReadCore(); void ReadData(); + void ReadMiscellaneous(); public: Config(); ~Config(); diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index 557da881..f1f626ee 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -32,6 +32,9 @@ gpu_refresh_rate = ## 60 (default) [Data Storage] use_virtual_sd = + +[Miscellaneous] +enable_log = )"; } |