summaryrefslogtreecommitdiff
path: root/src/citra_qt/main.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_qt/main.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_qt/main.cpp')
-rw-r--r--src/citra_qt/main.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 7b028e323..24506deab 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -352,14 +352,8 @@ void GMainWindow::closeEvent(QCloseEvent* event)
352 352
353int main(int argc, char* argv[]) 353int main(int argc, char* argv[])
354{ 354{
355 std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger();
356 Log::Filter log_filter(Log::Level::Info); 355 Log::Filter log_filter(Log::Level::Info);
357 Log::SetFilter(&log_filter); 356 Log::SetFilter(&log_filter);
358 std::thread logging_thread(Log::TextLoggingLoop, logger);
359 SCOPE_EXIT({
360 logger->Close();
361 logging_thread.join();
362 });
363 357
364 QApplication::setAttribute(Qt::AA_X11InitThreads); 358 QApplication::setAttribute(Qt::AA_X11InitThreads);
365 QApplication app(argc, argv); 359 QApplication app(argc, argv);