# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1053636157 0
# Node ID e6d751de784a321047d2d7ef0d095f06c4135b0c
# Parent  c3bb1270fa2b4fa0ac05b28ef2626586feb7ea45
Attempt #3: Fixed boolean logic bug that caused all HID joysticks to be
rejected on MacOSX/Darwin. Works now. No, really this time.  --ryan.

diff -r c3bb1270fa2b -r e6d751de784a src/joystick/darwin/SDL_sysjoystick.c
--- a/src/joystick/darwin/SDL_sysjoystick.c	Thu May 22 07:12:36 2003 +0000
+++ b/src/joystick/darwin/SDL_sysjoystick.c	Thu May 22 20:42:37 2003 +0000
@@ -647,7 +647,7 @@
 
 		/* Filter device list to non-keyboard/mouse stuff */ 
 		if ( device->usagePage == kHIDPage_GenericDesktop &&
-		     (device->usage != kHIDUsage_GD_Joystick ||
+		     (device->usage != kHIDUsage_GD_Joystick &&
 		      device->usage != kHIDUsage_GD_GamePad)) {
 
 			/* release memory for the device */