summaryrefslogtreecommitdiffstats
path: root/src/hid_core/frontend
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2024-01-23 18:01:35 +0100
committerNarr the Reg <juangerman-13@hotmail.com>2024-01-23 18:11:09 +0100
commit3b1c2896d9bc0f9f1bdfddc3820dc7d2483f4486 (patch)
tree629123147283844de7659f8ab4ea397ab25e5212 /src/hid_core/frontend
parentMerge pull request #12579 from FernandoS27/smmu (diff)
downloadyuzu-3b1c2896d9bc0f9f1bdfddc3820dc7d2483f4486.tar
yuzu-3b1c2896d9bc0f9f1bdfddc3820dc7d2483f4486.tar.gz
yuzu-3b1c2896d9bc0f9f1bdfddc3820dc7d2483f4486.tar.bz2
yuzu-3b1c2896d9bc0f9f1bdfddc3820dc7d2483f4486.tar.lz
yuzu-3b1c2896d9bc0f9f1bdfddc3820dc7d2483f4486.tar.xz
yuzu-3b1c2896d9bc0f9f1bdfddc3820dc7d2483f4486.tar.zst
yuzu-3b1c2896d9bc0f9f1bdfddc3820dc7d2483f4486.zip
Diffstat (limited to 'src/hid_core/frontend')
-rw-r--r--src/hid_core/frontend/emulated_controller.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp
index e12e5a77e..063f5b15a 100644
--- a/src/hid_core/frontend/emulated_controller.cpp
+++ b/src/hid_core/frontend/emulated_controller.cpp
@@ -110,7 +110,11 @@ void EmulatedController::ReloadFromSettings() {
original_npad_type = npad_type;
}
- SetPollingMode(EmulatedDeviceIndex::RightIndex, Common::Input::PollingMode::Active);
+ // Disable special features before disconnecting
+ if (controller.right_polling_mode != Common::Input::PollingMode::Active) {
+ SetPollingMode(EmulatedDeviceIndex::RightIndex, Common::Input::PollingMode::Active);
+ }
+
Disconnect();
if (player.connected) {
Connect();