1 files changed, 3 insertions, 7 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index f115c5b6a..24506deab 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -337,7 +337,9 @@ void GMainWindow::closeEvent(QCloseEvent* event)
     settings.setValue("firstStart", false);
     SaveHotkeys(settings);
 
-    ShutdownGame();
+    // Shutdown session if the emu thread is active...
+    if (emu_thread != nullptr)
+        ShutdownGame();
 
     render_window->close();
 
@@ -350,14 +352,8 @@ void GMainWindow::closeEvent(QCloseEvent* event)
 
 int main(int argc, char* argv[])
 {
-    std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger();
     Log::Filter log_filter(Log::Level::Info);
     Log::SetFilter(&log_filter);
-    std::thread logging_thread(Log::TextLoggingLoop, logger);
-    SCOPE_EXIT({
-        logger->Close();
-        logging_thread.join();
-    });
 
     QApplication::setAttribute(Qt::AA_X11InitThreads);
     QApplication app(argc, argv);