Revert to using guidProduct for all existing code, but the correct guidInstance

for detecting XInput devices only.
This commit is contained in:
hiker 2017-08-07 09:15:09 +10:00
parent 4c55ca4da9
commit e6c2c3df95

View File

@ -131,9 +131,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;