[PATCH 1/5] winebus.sys: Only call SDL_HapticRumbleInit if supported, as a fallback.
Rémi Bernon
rbernon at codeweavers.com
Mon Feb 14 05:54:39 CST 2022
The SDL_HAPTIC_LEFTRIGHT effect should be preferred when available.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
dlls/winebus.sys/bus_sdl.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
index eba8a959cb4..ce696f5b42f 100644
--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -185,14 +185,12 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl)
!(impl->sdl_haptic = pSDL_HapticOpenFromJoystick(impl->sdl_joystick)))
impl->effect_support = 0;
else
- {
impl->effect_support = pSDL_HapticQuery(impl->sdl_haptic);
- if (pSDL_HapticRumbleSupported(impl->sdl_haptic))
- impl->effect_support |= WINE_SDL_HAPTIC_RUMBLE;
- pSDL_HapticStopAll(impl->sdl_haptic);
- pSDL_HapticRumbleInit(impl->sdl_haptic);
- }
+ if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) &&
+ pSDL_HapticRumbleSupported(impl->sdl_haptic) &&
+ pSDL_HapticRumbleInit(impl->sdl_haptic) == 0)
+ impl->effect_support |= WINE_SDL_HAPTIC_RUMBLE;
if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && pSDL_JoystickRumble &&
!pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0))
--
2.34.1
More information about the wine-devel
mailing list