# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1053829072 0
# Node ID 477917048b91024a20adf048a51f26e2d7ab9f81
# Parent  e6d751de784a321047d2d7ef0d095f06c4135b0c
God, this is the never-ending patch. Another USB joystick detection fix for
 MacOSX/Darwin.  --ryan.

diff -r e6d751de784a -r 477917048b91 src/joystick/darwin/SDL_sysjoystick.c
--- a/src/joystick/darwin/SDL_sysjoystick.c	Thu May 22 20:42:37 2003 +0000
+++ b/src/joystick/darwin/SDL_sysjoystick.c	Sun May 25 02:17:52 2003 +0000
@@ -646,9 +646,9 @@
 //			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);