Преглед на файлове

Merge pull request #12735 from german77/disable-vibration

core: hid: Allow to disable vibration
liamwhite преди 2 години
родител
ревизия
92ce9273ee
променени са 1 файла, в които са добавени 7 реда и са изтрити 2 реда
  1. 7 2
      src/hid_core/frontend/emulated_controller.cpp

+ 7 - 2
src/hid_core/frontend/emulated_controller.cpp

@@ -1240,12 +1240,17 @@ bool EmulatedController::SetVibration(DeviceIndex device_index, const VibrationV
     if (!output_devices[index]) {
     if (!output_devices[index]) {
         return false;
         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_index = Service::HID::NpadIdTypeToIndex(npad_id_type);
     const auto& player = Settings::values.players.GetValue()[player_index];
     const auto& player = Settings::values.players.GetValue()[player_index];
     const f32 strength = static_cast<f32>(player.vibration_strength) / 100.0f;
     const f32 strength = static_cast<f32>(player.vibration_strength) / 100.0f;
 
 
-    last_vibration_value = vibration;
-
     if (!player.vibration_enabled) {
     if (!player.vibration_enabled) {
         return false;
         return false;
     }
     }