From 06d4bfc1da90932c3ebf1d1382f8db17974f4aee Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 25 May 2003 02:17:52 +0000
Subject: [PATCH] God, this is the never-ending patch. Another USB joystick
detection fix for MacOSX/Darwin. --ryan.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40624
---
src/joystick/darwin/SDL_sysjoystick.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
index 14a0ce89..e100ff5c 100644
--- a/src/joystick/darwin/SDL_sysjoystick.c
+++ b/src/joystick/darwin/SDL_sysjoystick.c
@@ -646,9 +646,9 @@ int SDL_SYS_JoystickInit(void)
// HIDReportErrorNum ("IOObjectRelease error with ioHIDDeviceObject.", result);
/* Filter device list to non-keyboard/mouse stuff */
- if ( device->usagePage == kHIDPage_GenericDesktop &&
- (device->usage != kHIDUsage_GD_Joystick &&
- device->usage != kHIDUsage_GD_GamePad)) {
+ if ( (device->usagePage != kHIDPage_GenericDesktop) ||
+ ((device->usage != kHIDUsage_GD_Joystick &&
+ device->usage != kHIDUsage_GD_GamePad)) ) {
/* release memory for the device */
HIDDisposeDevice (&device);
--
2.18.1