From 75d0b674d156884be7c4243cd51e58c335951bde Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Tue, 1 Aug 2023 20:48:58 -0700 Subject: [PATCH] Reverse conditional for hat switch null state check --- src/macosx/hidjoy.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/macosx/hidjoy.m b/src/macosx/hidjoy.m index 7dc4e70cd..430dd8c58 100644 --- a/src/macosx/hidjoy.m +++ b/src/macosx/hidjoy.m @@ -495,12 +495,12 @@ static void value_callback( int int_value = IOHIDValueGetIntegerValue(value); if (joy->dpad == elem){ - if (int_value > 0 && int_value <= MAX_HAT_DIRECTIONS) { - osx_joy_generate_axis_event(joy, joy->dpad_stick, joy->dpad_axis_vert, (float)hat_mapping[int_value-1].axisV); - osx_joy_generate_axis_event(joy, joy->dpad_stick, joy->dpad_axis_horiz, (float)hat_mapping[int_value-1].axisH); - } else if (joy->min[joy->dpad_stick][1] > int_value || joy->max[joy->dpad_stick][1] < int_value) { + if (joy->min[joy->dpad_stick][1] > int_value || joy->max[joy->dpad_stick][1] < int_value) { osx_joy_generate_axis_event(joy, joy->dpad_stick, joy->dpad_axis_vert, 0); osx_joy_generate_axis_event(joy, joy->dpad_stick, joy->dpad_axis_horiz, 0); + } else if (int_value > 0 && int_value <= MAX_HAT_DIRECTIONS) { + osx_joy_generate_axis_event(joy, joy->dpad_stick, joy->dpad_axis_vert, (float)hat_mapping[int_value-1].axisV); + osx_joy_generate_axis_event(joy, joy->dpad_stick, joy->dpad_axis_horiz, (float)hat_mapping[int_value-1].axisH); } goto done; }