From 0c9fce98a26edf933f079198df3346c0ba5fbe37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s?= Date: Tue, 5 Dec 2017 22:07:48 -0500 Subject: [PATCH] fix vid/pid enumeration on xinput controllers when the xinput controllers are interleaved with dinput (#5872) --- input/drivers_joypad/xinput_joypad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/drivers_joypad/xinput_joypad.c b/input/drivers_joypad/xinput_joypad.c index e2d08929d5..524d461160 100644 --- a/input/drivers_joypad/xinput_joypad.c +++ b/input/drivers_joypad/xinput_joypad.c @@ -282,7 +282,7 @@ static bool xinput_joypad_init(void *data) int pid = 0; #ifdef HAVE_DINPUT int dinput_index = 0; - bool success = dinput_joypad_get_vidpid_from_xinput_index(j, &vid, &pid, &dinput_index); + bool success = dinput_joypad_get_vidpid_from_xinput_index(pad_index_to_xuser_index(j), &vid, &pid, &dinput_index); if (success) RARCH_LOG("[XInput]: Found VID/PID (%04X/%04X) from DINPUT index %d for \"%s\", user #%u\n",