Do not recurse over IOHIDElement children.

src/iokit_joystick.m

@@ -67,65 +67,53 @@ static void addJoystickElement(_GLFWjoydevice* joystick, IOHIDElementRef element
     usagePage = IOHIDElementGetUsagePage(elementRef);
     usage = IOHIDElementGetUsage(elementRef);
 
-    if ((elementType == kIOHIDElementTypeInput_Axis) ||
+    if ((elementType != kIOHIDElementTypeInput_Axis) &&
-        (elementType == kIOHIDElementTypeInput_Button) ||
+        (elementType != kIOHIDElementTypeInput_Button) &&
-        (elementType == kIOHIDElementTypeInput_Misc))
+        (elementType != kIOHIDElementTypeInput_Misc))
+        return;
+
+    switch (usagePage)
     {
-        switch (usagePage)
+        case kHIDPage_GenericDesktop:
         {
-            case kHIDPage_GenericDesktop:
+            switch (usage)
             {
-                switch (usage)
+                case kHIDUsage_GD_X:
-                {
+                case kHIDUsage_GD_Y:
-                    case kHIDUsage_GD_X:
+                case kHIDUsage_GD_Z:
-                    case kHIDUsage_GD_Y:
+                case kHIDUsage_GD_Rx:
-                    case kHIDUsage_GD_Z:
+                case kHIDUsage_GD_Ry:
-                    case kHIDUsage_GD_Rx:
+                case kHIDUsage_GD_Rz:
-                    case kHIDUsage_GD_Ry:
+                case kHIDUsage_GD_Slider:
-                    case kHIDUsage_GD_Rz:
+                case kHIDUsage_GD_Dial:
-                    case kHIDUsage_GD_Slider:
+                case kHIDUsage_GD_Wheel:
-                    case kHIDUsage_GD_Dial:
+                    elementsArray = joystick->axisElements;
-                    case kHIDUsage_GD_Wheel:
+                    break;
-                        elementsArray = joystick->axisElements;
+                case kHIDUsage_GD_Hatswitch:
-                        break;
+                    elementsArray = joystick->hatElements;
-                    case kHIDUsage_GD_Hatswitch:
+                    break;
-                        elementsArray = joystick->hatElements;
-                        break;
-                }
-
-                break;
             }
 
-            case kHIDPage_Button:
+            break;
-                elementsArray = joystick->buttonElements;
-                break;
-            default:
-                break;
         }
 
-        if (elementsArray)
+        case kHIDPage_Button:
-        {
+            elementsArray = joystick->buttonElements;
-            _GLFWjoyelement* element = calloc(1, sizeof(_GLFWjoyelement));
+            break;
+        default:
+            break;
+    }
+
+    if (elementsArray)
+    {
+        _GLFWjoyelement* element = calloc(1, sizeof(_GLFWjoyelement));
 
-            CFArrayAppendValue(elementsArray, element);
+        CFArrayAppendValue(elementsArray, element);
 
-            element->elementRef = elementRef;
+        element->elementRef = elementRef;
 
-            element->minReport = IOHIDElementGetLogicalMin(elementRef);
+        element->minReport = IOHIDElementGetLogicalMin(elementRef);
-            element->maxReport = IOHIDElementGetLogicalMax(elementRef);
+        element->maxReport = IOHIDElementGetLogicalMax(elementRef);
-        }
-    }
-    else
-    {
-        CFArrayRef array = IOHIDElementGetChildren(elementRef);
-        if (array)
-        {
-            if (CFGetTypeID(array) == CFArrayGetTypeID())
-            {
-                CFRange range = { 0, CFArrayGetCount(array) };
-                CFArrayApplyFunction(array, range, getElementsCFArrayHandler, joystick);
-            }
-        }
     }
 }