summaryrefslogtreecommitdiffstats
path: root/src/citra/citra.cpp
diff options
context:
space:
mode:
authorTony Wasserka <neobrainx@gmail.com>2014-11-15 12:42:08 +0100
committerTony Wasserka <neobrainx@gmail.com>2014-11-15 12:42:08 +0100
commit80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15 (patch)
treeae06f0da5ace2aabd76d2e653c0e6db3f626e123 /src/citra/citra.cpp
parentMerge pull request #193 from lioncash/fmt (diff)
parentAdd support for disabling log from settings (diff)
downloadyuzu-80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15.tar
yuzu-80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15.tar.gz
yuzu-80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15.tar.bz2
yuzu-80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15.tar.lz
yuzu-80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15.tar.xz
yuzu-80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15.tar.zst
yuzu-80e9c02bd6ec7c4113b69a9172b9c9ae6dc5cf15.zip
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 @@
#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;