Merge pull request #6599 from german77/disable_rumble

npad: Disable vibration check if disabled
This commit is contained in:
Ameer J 2021-07-13 16:11:59 -04:00 committed by GitHub
commit f2599534f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -941,6 +941,11 @@ void Controller_NPad::InitializeVibrationDevice(const DeviceHandle& vibration_de
void Controller_NPad::InitializeVibrationDeviceAtIndex(std::size_t npad_index, void Controller_NPad::InitializeVibrationDeviceAtIndex(std::size_t npad_index,
std::size_t device_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]) { if (vibrations[npad_index][device_index]) {
vibration_devices_mounted[npad_index][device_index] = vibration_devices_mounted[npad_index][device_index] =
vibrations[npad_index][device_index]->GetStatus() == 1; vibrations[npad_index][device_index]->GetStatus() == 1;