summaryrefslogtreecommitdiff
path: root/src/citra/citra.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2015-05-15 20:54:48 -0700
committerGravatar Yuri Kunde Schlesner2015-05-15 20:54:48 -0700
commitba2fe7f795ebc8da4acd247436afeefb900645d3 (patch)
treebe9a2cbcdd840f41be5353a33a98bff3ca31544e /src/citra/citra.cpp
parentMerge pull request #780 from citra-emu/roadmap (diff)
parentRemove unused concurrent_ring_buffer.h (diff)
downloadyuzu-ba2fe7f795ebc8da4acd247436afeefb900645d3.tar.gz
yuzu-ba2fe7f795ebc8da4acd247436afeefb900645d3.tar.xz
yuzu-ba2fe7f795ebc8da4acd247436afeefb900645d3.zip
Merge pull request #758 from yuriks/sync-logging
Common: Remove async logging
Diffstat (limited to 'src/citra/citra.cpp')
-rw-r--r--src/citra/citra.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 1d7e7f270..ca93d5b91 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -20,14 +20,8 @@
20 20
21/// Application entry point 21/// Application entry point
22int main(int argc, char **argv) { 22int main(int argc, char **argv) {
23 std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger();
24 Log::Filter log_filter(Log::Level::Debug); 23 Log::Filter log_filter(Log::Level::Debug);
25 Log::SetFilter(&log_filter); 24 Log::SetFilter(&log_filter);
26 std::thread logging_thread(Log::TextLoggingLoop, logger);
27 SCOPE_EXIT({
28 logger->Close();
29 logging_thread.join();
30 });
31 25
32 if (argc < 2) { 26 if (argc < 2) {
33 LOG_CRITICAL(Frontend, "Failed to load ROM: No ROM specified"); 27 LOG_CRITICAL(Frontend, "Failed to load ROM: No ROM specified");