mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-22 16:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't return bogus if joypad isn't connected.

Browse Source
This commit is contained in:
Themaister 2012-09-30 15:59:05 +02:00
parent 4e4972aa7a
commit c6c68dfcf1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/dinput.c
View File

@ -225,7 +225,8 @@ static void dinput_poll(void *data)
sizeof(di->state), di->state))) sizeof(di->state), di->state)))
{ {
IDirectInputDevice8_Acquire(di->keyboard); IDirectInputDevice8_Acquire(di->keyboard);
IDirectInputDevice8_GetDeviceState(di->keyboard, sizeof(di->state), di->state); if (FAILED(IDirectInputDevice8_GetDeviceState(di->keyboard, sizeof(di->state), di->state)))
memset(di->state, 0, sizeof(di->state));
} }
input_joypad_poll(di->joypad); input_joypad_poll(di->joypad);
@ -388,6 +389,8 @@ static bool dinput_joypad_button(unsigned port_num, uint16_t joykey)
return false; return false;
const struct dinput_joypad *pad = &g_pads[port_num]; const struct dinput_joypad *pad = &g_pads[port_num];
if (!pad->joypad)
return false;
// Check hat. // Check hat.
if (GET_HAT_DIR(joykey)) if (GET_HAT_DIR(joykey))
@ -435,6 +438,8 @@ static int16_t dinput_joypad_axis(unsigned port_num, uint32_t joyaxis)
return 0; return 0;
const struct dinput_joypad *pad = &g_pads[port_num]; const struct dinput_joypad *pad = &g_pads[port_num];
if (!pad->joypad)
return false;
int val = 0; int val = 0;
@ -491,7 +496,10 @@ static void dinput_joypad_poll(void)
// If this fails, something *really* bad must have happened. // If this fails, something *really* bad must have happened.
if (FAILED(IDirectInputDevice8_Poll(pad->joypad))) if (FAILED(IDirectInputDevice8_Poll(pad->joypad)))
{
memset(&pad->joy_state, 0, sizeof(DIJOYSTATE2));
continue; continue;
}
} }
IDirectInputDevice8_GetDeviceState(pad->joypad, IDirectInputDevice8_GetDeviceState(pad->joypad,