Fix: Some joysticks return an invalid HID page of 1

diff --git a/src/OpenTK/Platform/Windows/WinRawJoystick.cs b/src/OpenTK/Platform/Windows/WinRawJoystick.cs
index 82f13c60e6c4d37b6d03bce0dfec0064a7ff9fcc..ccc82425c9f1d80bdde59ca17375ab8dd2b392d0 100644 (file)
--- a/src/OpenTK/Platform/Windows/WinRawJoystick.cs
+++ b/src/OpenTK/Platform/Windows/WinRawJoystick.cs
@@ -83,8 +83,13 @@ namespace OpenTK.Platform.Windows
             {
                 if (page == HIDPage.GenericDesktop || page == HIDPage.Simulation) // set axis only when HIDPage is known by HidHelper.TranslateJoystickAxis() to avoid axis0 to be overwritten by unknown HIDPage
                 {
-                    JoystickAxis axis = GetAxis(collection, page, usage);
-                    State.SetAxis(axis, value);
+                                       //Certain joysticks (Speedlink Black Widow, PS3 pad connected via USB)
+                                       //return an invalid HID page of 1, so 
+                    if ((int)usage != 1)
+                    {
+                        JoystickAxis axis = GetAxis(collection, page, usage);
+                        State.SetAxis(axis, value);
+                    }
                 }
             }