# HG changeset patch # User Edgar Simo # Date 1267349003 0 # Node ID 7953336267c20924b34af24ce0331ead6f266ea1 # Parent 2e140f18aba7ea2b9893a1b86759315afdcedfc9 Disable error checks for reset actuators and set autocenter. Reset actuators and set autocenter might not actually be supported on all implementations. We'll just disable error checking since they aren't critical to neither opening the joystick nor the haptic subsystem. diff -r 2e140f18aba7 -r 7953336267c2 src/joystick/win32/SDL_dxjoystick.c --- a/src/joystick/win32/SDL_dxjoystick.c Sun Feb 28 03:23:07 2010 -0500 +++ b/src/joystick/win32/SDL_dxjoystick.c Sun Feb 28 09:23:23 2010 +0000 @@ -439,11 +439,13 @@ InputDevice, DISFFC_RESET); + /* Not necessarily supported, ignore if not supported. if (FAILED(result)) { SetDIerror("IDirectInputDevice2::SendForceFeedbackCommand", result); return (-1); } + */ result = IDirectInputDevice2_Unacquire(joystick->hwdata->InputDevice); @@ -462,10 +464,12 @@ IDirectInputDevice2_SetProperty(joystick->hwdata->InputDevice, DIPROP_AUTOCENTER, &dipdw.diph); + /* Not necessarily supported, ignore if not supported. if (FAILED(result)) { SetDIerror("IDirectInputDevice2::SetProperty", result); return (-1); } + */ } /* What buttons and axes does it have? */