From 7b465bda3fa8209b7e4d997ed52a4072bc401fa2 Mon Sep 17 00:00:00 2001 From: antangelo Date: Fri, 26 Dec 2025 13:22:53 -0500 Subject: [PATCH] ui: Fix rumble setting migration overwriting controller rumble with default --- ui/xemu-settings.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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; }