encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed updating the rumble parameters on Linux

This commit is contained in:
Sam Lantinga 2018-10-16 14:58:07 -07:00
parent b0c48dd9dd
commit 708ad1fd8d
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/joystick/linux/SDL_sysjoystick.c
View File

@ -814,7 +814,6 @@ LINUX_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint1
{ {
struct input_event event; struct input_event event;
if (joystick->hwdata->effect.id < 0) {
if (joystick->hwdata->ff_rumble) { if (joystick->hwdata->ff_rumble) {
struct ff_effect *effect = &joystick->hwdata->effect; struct ff_effect *effect = &joystick->hwdata->effect;
@ -834,7 +833,6 @@ LINUX_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint1
} else { } else {
return SDL_Unsupported(); return SDL_Unsupported();
} }
}
if (ioctl(joystick->hwdata->fd, EVIOCSFF, &joystick->hwdata->effect) < 0) { if (ioctl(joystick->hwdata->fd, EVIOCSFF, &joystick->hwdata->effect) < 0) {
return SDL_SetError("Couldn't update rumble effect: %s", strerror(errno)); return SDL_SetError("Couldn't update rumble effect: %s", strerror(errno));