summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmeer J <52414509+ameerj@users.noreply.github.com>2021-07-13 22:11:59 +0200
committerGitHub <noreply@github.com>2021-07-13 22:11:59 +0200
commitf2599534f8e096053bf7e8887ce729400a346e92 (patch)
tree63553ded4d5d91a54c82375cd3527a1e7f2537b1
parentMerge pull request #6574 from lioncash/i18n (diff)
parentnpad: Disable vibration check if disabled (diff)
downloadyuzu-f2599534f8e096053bf7e8887ce729400a346e92.tar
yuzu-f2599534f8e096053bf7e8887ce729400a346e92.tar.gz
yuzu-f2599534f8e096053bf7e8887ce729400a346e92.tar.bz2
yuzu-f2599534f8e096053bf7e8887ce729400a346e92.tar.lz
yuzu-f2599534f8e096053bf7e8887ce729400a346e92.tar.xz
yuzu-f2599534f8e096053bf7e8887ce729400a346e92.tar.zst
yuzu-f2599534f8e096053bf7e8887ce729400a346e92.zip
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index 1eb02aee2..6ce1360e3 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -941,6 +941,11 @@ void Controller_NPad::InitializeVibrationDevice(const DeviceHandle& vibration_de
void Controller_NPad::InitializeVibrationDeviceAtIndex(std::size_t npad_index,
std::size_t device_index) {
+ if (!Settings::values.vibration_enabled.GetValue()) {
+ vibration_devices_mounted[npad_index][device_index] = false;
+ return;
+ }
+
if (vibrations[npad_index][device_index]) {
vibration_devices_mounted[npad_index][device_index] =
vibrations[npad_index][device_index]->GetStatus() == 1;