Reverse conditional for hat switch null state check

liballeg · Aug 15, 2023 · 75d0b67 · 75d0b67
1 parent 6526843
commit 75d0b67
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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;
    }