summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-07-11 03:06:07 +0200
committergerman77 <juangerman-13@hotmail.com>2021-07-11 03:06:07 +0200
commited5f1a45b74f90fecc1fe4ec829e190f8172ffd1 (patch)
treed148002103e793b570c4e98e928594f3980d4027 /src/core/hle/service
parentMerge pull request #6573 from lat9nq/cpu-settings-cleanup-2 (diff)
downloadyuzu-ed5f1a45b74f90fecc1fe4ec829e190f8172ffd1.tar
yuzu-ed5f1a45b74f90fecc1fe4ec829e190f8172ffd1.tar.gz
yuzu-ed5f1a45b74f90fecc1fe4ec829e190f8172ffd1.tar.bz2
yuzu-ed5f1a45b74f90fecc1fe4ec829e190f8172ffd1.tar.lz
yuzu-ed5f1a45b74f90fecc1fe4ec829e190f8172ffd1.tar.xz
yuzu-ed5f1a45b74f90fecc1fe4ec829e190f8172ffd1.tar.zst
yuzu-ed5f1a45b74f90fecc1fe4ec829e190f8172ffd1.zip
Diffstat (limited to 'src/core/hle/service')
-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;