Merge branch 'improve-xbox-gamepad-support' of github.com:supertuxkart/stk-code into improve-xbox-gamepad-support

This commit is contained in:
hiker 2017-08-09 10:23:52 +10:00
commit 6f5b1d2a55

View File

@ -135,9 +135,9 @@ struct SJoystickWin32Control
void directInputAddJoystick(LPCDIDEVICEINSTANCE lpddi) void directInputAddJoystick(LPCDIDEVICEINSTANCE lpddi)
{ {
//Get the GUID of the joystuck //Get the GUID of the joystuck
const GUID guid = lpddi->guidProduct; const GUID guid = lpddi->guidInstance;
JoystickInfo activeJoystick; JoystickInfo activeJoystick;
activeJoystick.m_use_xinput = isXInputDevice(&guid); activeJoystick.m_use_xinput = isXInputDevice(&lpddi->guidProduct);
activeJoystick.Index=ActiveJoysticks.size(); activeJoystick.Index=ActiveJoysticks.size();
activeJoystick.guid=guid; activeJoystick.guid=guid;