mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-04 03:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xinput-perf-fix' into xinput-autoconf

Browse Source
This commit is contained in:
pinumbernumber 2013-08-27 20:56:15 +01:00
commit ee57fe6a95
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/dinput.c
View File

@ -598,7 +598,7 @@ static void dinput_joypad_poll(void)
{
struct dinput_joypad *pad = &g_pads[i];
if (pad->joypad)
if ((pad->joypad) && (g_xbox_pad_indexes[i] == -1))
{
memset(&pad->joy_state, 0, sizeof(pad->joy_state));

5
input/winxinput_joypad.c
View File

@ -347,8 +347,9 @@ static int16_t winxinput_joypad_axis (unsigned port_num, uint32_t joyaxis)
static void winxinput_joypad_poll(void)
{
for (unsigned i = 0; i < 4; ++i)
if (g_XInputGetStateEx(i, &(g_winxinput_states[i].xstate)) == ERROR_DEVICE_NOT_CONNECTED)
g_winxinput_states[i].connected = false;
if (g_winxinput_states[i].connected)
if (g_XInputGetStateEx(i, &(g_winxinput_states[i].xstate)) != ERROR_SUCCESS)
g_winxinput_states[i].connected = false;
dinput_joypad.poll();
}