summaryrefslogtreecommitdiff
path: root/src/citra/citra.cpp
diff options
context:
space:
mode:
authorGravatar Sean2014-10-27 17:18:28 -0400
committerGravatar Sean2014-11-03 17:00:32 -0500
commit371b61f3eaf6ad8bc35311d906c8d780d1531f8b (patch)
tree9eb38c4d0033ba414b749f7905ff91ec0e7a93bc /src/citra/citra.cpp
parentMerge pull request #154 from lioncash/dyncom (diff)
downloadyuzu-371b61f3eaf6ad8bc35311d906c8d780d1531f8b.tar.gz
yuzu-371b61f3eaf6ad8bc35311d906c8d780d1531f8b.tar.xz
yuzu-371b61f3eaf6ad8bc35311d906c8d780d1531f8b.zip
Add support for disabling log from settings
Diffstat (limited to 'src/citra/citra.cpp')
-rw-r--r--src/citra/citra.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 6ac5c5dc5..41b62ac16 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -5,6 +5,7 @@
5#include "common/common.h" 5#include "common/common.h"
6#include "common/log_manager.h" 6#include "common/log_manager.h"
7 7
8#include "core/settings.h"
8#include "core/system.h" 9#include "core/system.h"
9#include "core/core.h" 10#include "core/core.h"
10#include "core/loader/loader.h" 11#include "core/loader/loader.h"
@@ -22,6 +23,9 @@ int __cdecl main(int argc, char **argv) {
22 } 23 }
23 24
24 Config config; 25 Config config;
26
27 if (!Settings::values.enable_log)
28 LogManager::Shutdown();
25 29
26 std::string boot_filename = argv[1]; 30 std::string boot_filename = argv[1];
27 EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; 31 EmuWindow_GLFW* emu_window = new EmuWindow_GLFW;