Skip to content

Commit 75d0b67

Browse files
connorjclarkSiegeLord
authored andcommitted
Reverse conditional for hat switch null state check
1 parent 6526843 commit 75d0b67

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/macosx/hidjoy.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -495,12 +495,12 @@ static void value_callback(
495495
int int_value = IOHIDValueGetIntegerValue(value);
496496

497497
if (joy->dpad == elem){
498-
if (int_value > 0 && int_value <= MAX_HAT_DIRECTIONS) {
499-
osx_joy_generate_axis_event(joy, joy->dpad_stick, joy->dpad_axis_vert, (float)hat_mapping[int_value-1].axisV);
500-
osx_joy_generate_axis_event(joy, joy->dpad_stick, joy->dpad_axis_horiz, (float)hat_mapping[int_value-1].axisH);
501-
} else if (joy->min[joy->dpad_stick][1] > int_value || joy->max[joy->dpad_stick][1] < int_value) {
498+
if (joy->min[joy->dpad_stick][1] > int_value || joy->max[joy->dpad_stick][1] < int_value) {
502499
osx_joy_generate_axis_event(joy, joy->dpad_stick, joy->dpad_axis_vert, 0);
503500
osx_joy_generate_axis_event(joy, joy->dpad_stick, joy->dpad_axis_horiz, 0);
501+
} else if (int_value > 0 && int_value <= MAX_HAT_DIRECTIONS) {
502+
osx_joy_generate_axis_event(joy, joy->dpad_stick, joy->dpad_axis_vert, (float)hat_mapping[int_value-1].axisV);
503+
osx_joy_generate_axis_event(joy, joy->dpad_stick, joy->dpad_axis_horiz, (float)hat_mapping[int_value-1].axisH);
504504
}
505505
goto done;
506506
}

0 commit comments

Comments
 (0)