From e6c2c3df95af542eae44c40a0db0168abfbfaa8c Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 7 Aug 2017 09:15:09 +1000
Subject: [PATCH] Revert to using guidProduct for all existing code, but the
 correct guidInstance for detecting XInput devices only.

---
 lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index 04d568a36..21319c149 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -131,9 +131,9 @@ struct SJoystickWin32Control
     void directInputAddJoystick(LPCDIDEVICEINSTANCE lpddi)
     {
         //Get the GUID of the joystuck
-        const GUID guid = lpddi->guidProduct;
+        const GUID guid = lpddi->guidInstance;
         JoystickInfo activeJoystick;
-        activeJoystick.m_use_xinput = isXInputDevice(&guid);
+        activeJoystick.m_use_xinput = isXInputDevice(&lpddi->guidProduct);
     
         activeJoystick.Index=ActiveJoysticks.size();
         activeJoystick.guid=guid;