From 01eb98cfdc3321b5e4560d50f8cf49de4b4254b6 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Sun, 21 Nov 2021 09:52:03 +0100 Subject: [PATCH] early-access version 2230 --- README.md | 2 +- src/yuzu/main.cpp | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 26aa2cc59..429cdb2bd 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2229. +This is the source code for early-access 2230. ## Legal Notice diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index c1ef554d0..be08b88c8 100755 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1335,14 +1335,8 @@ bool GMainWindow::LoadROM(const QString& filename, u64 program_id, std::size_t p std::make_unique(*this), // Web Browser }); - 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 Core::SystemResultStatus result{ + system->Load(*render_window, filename.toStdString(), program_id, program_index)}; const auto drd_callout = (UISettings::values.callout_flags.GetValue() & static_cast(CalloutFlag::DRDDeprecation)) == 0;