From 5d686986e73ccf26bfa70727e7edb3e2fd6f2b16 Mon Sep 17 00:00:00 2001
From: vonchenplus <vonchenplus@gmail.com>
Date: Mon, 15 Nov 2021 22:36:04 +0800
Subject: [PATCH] Fix crash when exit app

---
 src/yuzu/main.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 4e5552d2a1..d9c003b0dd 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1273,8 +1273,14 @@ bool GMainWindow::LoadROM(const QString& filename, u64 program_id, std::size_t p
         std::make_unique<QtWebBrowser>(*this),         // Web Browser
     });
 
-    const Core::SystemResultStatus result{
-        system->Load(*render_window, filename.toStdString(), program_id, program_index)};
+    Core::SystemResultStatus result{};
+    auto load_thread = std::jthread(
+        [this, filename, program_id, program_index](Core::SystemResultStatus& result) {
+            result =
+                system->Load(*render_window, filename.toStdString(), program_id, program_index);
+        },
+        std::ref(result));
+    load_thread.join();
 
     const auto drd_callout = (UISettings::values.callout_flags.GetValue() &
                               static_cast<u32>(CalloutFlag::DRDDeprecation)) == 0;