From 371b61f3eaf6ad8bc35311d906c8d780d1531f8b Mon Sep 17 00:00:00 2001
From: Sean <seanmaas27@gmail.com>
Date: Mon, 27 Oct 2014 17:18:28 -0400
Subject: Add support for disabling log from settings

---
 src/citra/citra.cpp     | 4 ++++
 src/citra/config.cpp    | 5 +++++
 src/citra/config.h      | 1 +
 src/citra/default_ini.h | 3 +++
 4 files changed, 13 insertions(+)

(limited to 'src/citra')

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 03a0ce60..65edcfc9 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -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() {
diff --git a/src/citra/config.h b/src/citra/config.h
index c4fac245..63b5978e 100644
--- a/src/citra/config.h
+++ b/src/citra/config.h
@@ -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();
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index e7e45f4a..1f0b6cad 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -28,6 +28,9 @@ pad_sright =
 
 [Data Storage]
 use_virtual_sd =
+
+[Miscellaneous]
+enable_log =
 )";
 
 }
-- 
cgit v1.2.3