diff --git a/ui/xemu-settings.cc b/ui/xemu-settings.cc index 08b0b8d038..b2fb387227 100644 --- a/ui/xemu-settings.cc +++ b/ui/xemu-settings.cc @@ -276,7 +276,9 @@ GamepadMappings *xemu_settings_load_gamepad_mapping(const char *guid, bool reset } // Migrate global 'allow_vibration' setting to the controller config - mapping->enable_rumble = g_config.input.allow_vibration; + if (!g_config.input.allow_vibration) { + mapping->enable_rumble = g_config.input.allow_vibration; + } return mapping; } @@ -302,7 +304,9 @@ GamepadMappings *xemu_settings_load_gamepad_mapping(const char *guid, bool reset .gamepad_mappings[g_config.input.gamepad_mappings_count - 1]; // Migrate global 'allow_vibration' setting to the controller config - mapping->enable_rumble = g_config.input.allow_vibration; + if (!g_config.input.allow_vibration) { + mapping->enable_rumble = g_config.input.allow_vibration; + } return mapping; }