3 files changed, 22 insertions, 0 deletions

diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index 0c4f75a96..0ebc15f13 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -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() {
diff --git a/src/citra_qt/config.h b/src/citra_qt/config.h
index 74c9ff11d..979902467 100644
--- a/src/citra_qt/config.h
+++ b/src/citra_qt/config.h
@@ -17,6 +17,9 @@ class Config {
 
     void ReadData();
     void SaveData();
+
+    void ReadMiscellaneous();
+    void SaveMiscellaneous();
 public:
     Config();
     ~Config();
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index bac6a6bb8..c99f92835 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -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();