Merge pull request #12735 from german77/disable-vibration

core: hid: Allow to disable vibration
2024-01-21 19:15:46 +07:00 · 2024-01-21 19:15:46 +07:00 · 92ce9273ee
parent a3199401f4 a7a7720752
commit 92ce9273ee
1 changed files with 7 additions and 2 deletions
--- a/src/hid_core/frontend/emulated_controller.cpp
+++ b/src/hid_core/frontend/emulated_controller.cpp
@ -1240,12 +1240,17 @@ bool EmulatedController::SetVibration(DeviceIndex device_index, const VibrationV
    if (!output_devices[index]) {
        return false;
    }
+
+    last_vibration_value = vibration;
+
+    if (!Settings::values.vibration_enabled) {
+        return false;
+    }
+
    const auto player_index = Service::HID::NpadIdTypeToIndex(npad_id_type);
    const auto& player = Settings::values.players.GetValue()[player_index];
    const f32 strength = static_cast<f32>(player.vibration_strength) / 100.0f;

-    last_vibration_value = vibration;
-
    if (!player.vibration_enabled) {
        return false;
    }