internal/gamepad: bug fix: crash when XInput and DInput gamepads were…

… connected Closes #3047
hajimehoshi · Jul 20, 2024 · 29946d0 · 29946d0
1 parent e5bb046
commit 29946d0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/internal/gamepad/gamepad_desktop_windows.go b/internal/gamepad/gamepad_desktop_windows.go
@@ -329,7 +329,12 @@ func (g *nativeGamepadsDesktop) dinput8EnumDevicesCallback(lpddi *_DIDEVICEINSTA
 
 	var findErr error
 	if gamepads.find(func(g *Gamepad) bool {
-		path, err := getDInputPath(g.native.(*nativeGamepadDesktop).dinputDevice)
+		// A DInput device can be nil when the device is an XInput device (#3047).
+		d := g.native.(*nativeGamepadDesktop).dinputDevice
+		if d == nil {
+			return false
+		}
+		path, err := getDInputPath(d)
 		if err != nil {
 			findErr = err
 			return true