From b29bc2f5347a3d4407a1fb4e4275ad889474d8fc Mon Sep 17 00:00:00 2001
From: Thomas Altenburger <mister.helmut@gmail.com>
Date: Fri, 8 Jan 2016 13:16:38 +0100
Subject: [PATCH] Fixes keyboard being recognized as 2 HID devices

---
 Source/OpenTK/Platform/Windows/WinRawJoystick.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/OpenTK/Platform/Windows/WinRawJoystick.cs b/Source/OpenTK/Platform/Windows/WinRawJoystick.cs
index 455dfe5..82f13c6 100644
--- a/Source/OpenTK/Platform/Windows/WinRawJoystick.cs
+++ b/Source/OpenTK/Platform/Windows/WinRawJoystick.cs
@@ -261,7 +261,7 @@ namespace OpenTK.Platform.Windows
 
                     // This is a new device, query its capabilities and add it
                     // to the device list
-                    if (!QueryDeviceCaps(device))
+                    if (!QueryDeviceCaps(device) && !is_xinput)
                     {
                         continue;
                     }
@@ -611,6 +611,8 @@ namespace OpenTK.Platform.Windows
                         }
                     }
                 }
+                else
+                    return false;
             }
             finally
             {
-- 
2.7.4