From d76548b8a5c08911f08ff32c7a25f6bbf5ec06c6 Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Sat, 18 Mar 2023 19:22:01 +0100
Subject: [PATCH] early-access version 3463

---
 README.md                                  | 2 +-
 src/common/bounded_threadsafe_queue.h      | 5 +++--
 src/yuzu/configuration/configure_input.cpp | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8d7f99ad6..6743716d2 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 3462.
+This is the source code for early-access 3463.
 
 ## Legal Notice
 
diff --git a/src/common/bounded_threadsafe_queue.h b/src/common/bounded_threadsafe_queue.h
index 7f55a84a5..8febc3002 100755
--- a/src/common/bounded_threadsafe_queue.h
+++ b/src/common/bounded_threadsafe_queue.h
@@ -9,10 +9,11 @@
 #include <memory>
 #include <mutex>
 #include <new>
-#include <stop_token>
 #include <type_traits>
 #include <utility>
 
+#include "common/polyfill_thread.h"
+
 namespace Common {
 
 #if defined(__cpp_lib_hardware_interference_size)
@@ -78,7 +79,7 @@ public:
         auto& slot = slots[idx(tail)];
         if (!slot.turn.test()) {
             std::unique_lock lock{cv_mutex};
-            cv.wait(lock, stop, [&slot] { return slot.turn.test(); });
+            Common::CondvarWait(cv, lock, stop, [&slot] { return slot.turn.test(); });
         }
         v = slot.move();
         slot.destroy();
diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp
index d0cf94dfc..c00d5a7da 100755
--- a/src/yuzu/configuration/configure_input.cpp
+++ b/src/yuzu/configuration/configure_input.cpp
@@ -189,6 +189,8 @@ QList<QWidget*> ConfigureInput::GetSubTabs() const {
 }
 
 void ConfigureInput::ApplyConfiguration() {
+    const bool was_global = Settings::values.players.UsingGlobal();
+    Settings::values.players.SetGlobal(true);
     for (auto* controller : player_controllers) {
         controller->ApplyConfiguration();
     }
@@ -201,6 +203,7 @@ void ConfigureInput::ApplyConfiguration() {
 
     Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked());
     Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked());
+    Settings::values.players.SetGlobal(was_global);
 }
 
 void ConfigureInput::changeEvent(QEvent* event) {