~ruther/qmk_firmware: Compile error if ONESHOT_TIMEOUT defined but oneshot disabled (#8100)

c3200aa8fcf86122736846017ca7b125ac225842 — Ted Lin 5 years ago 6052aa4

Compile error if ONESHOT_TIMEOUT defined but oneshot disabled (#8100)

* Compile error if ONESHOT_TIMEOUT defined but oneshot disabled

When ONESHOT_TIMEOUT and NO_ACTION_ONESHOT are both defined, this code
fails to compile.

Wrap the one usage of ONESHOT_TIMEOUT that is inconsistent with the
rest so all usages are properly wrapped by a check of NO_ACTION_ONESHOT.

* Run file through clang-format

Co-authored-by: Ted M Lin <tedmlin@gmail.com>

patch browse .tar.gz

1 files changed, 3 insertions(+), 1 deletions(-)

M tmk_core/common/action.c

M tmk_core/common/action.c => tmk_core/common/action.c +3 -1

@@ 90,13 90,15 @@ void action_exec(keyevent_t event) {
 
     keyrecord_t record = {.event = event};
 
-#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
+#ifndef NO_ACTION_ONESHOT
+#    if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
     if (has_oneshot_layer_timed_out()) {
         clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
     }
     if (has_oneshot_mods_timed_out()) {
         clear_oneshot_mods();
     }
+#    endif
 #endif
 
 #ifndef NO_ACTION_TAPPING