summaryrefslogtreecommitdiff
path: root/src/citra/config.cpp
diff options
context:
space:
mode:
authorGravatar Tony Wasserka2014-11-15 12:42:08 +0100
committerGravatar Tony Wasserka2014-11-15 12:42:08 +0100
commit80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15 (patch)
treeae06f0da5ace2aabd76d2e653c0e6db3f626e123 /src/citra/config.cpp
parentMerge pull request #193 from lioncash/fmt (diff)
parentAdd support for disabling log from settings (diff)
downloadyuzu-80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15.tar.gz
yuzu-80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15.tar.xz
yuzu-80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15.zip
Merge pull request #159 from SeannyM/enable_log
Add support for disabling log from settings
Diffstat (limited to 'src/citra/config.cpp')
-rw-r--r--src/citra/config.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index c5ce8a164..f45d09fc2 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -65,11 +65,16 @@ void Config::ReadData() {
65 Settings::values.use_virtual_sd = glfw_config->GetBoolean("Data Storage", "use_virtual_sd", true); 65 Settings::values.use_virtual_sd = glfw_config->GetBoolean("Data Storage", "use_virtual_sd", true);
66} 66}
67 67
68void Config::ReadMiscellaneous() {
69 Settings::values.enable_log = glfw_config->GetBoolean("Miscellaneous", "enable_log", true);
70}
71
68void Config::Reload() { 72void Config::Reload() {
69 LoadINI(glfw_config, glfw_config_loc.c_str(), DefaultINI::glfw_config_file); 73 LoadINI(glfw_config, glfw_config_loc.c_str(), DefaultINI::glfw_config_file);
70 ReadControls(); 74 ReadControls();
71 ReadCore(); 75 ReadCore();
72 ReadData(); 76 ReadData();
77 ReadMiscellaneous();
73} 78}
74 79
75Config::~Config() { 80Config::~Config() {