summaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authorTed Lin <49993528+tedlinsonos@users.noreply.github.com>2020-02-09 23:50:45 -0500
committerFlorian Didron <fdidron@users.noreply.github.com>2020-02-26 10:15:12 +0900
commitf3154a54facfe8ad26246d9bbe05335ba5d0f716 (patch)
treed234d51755df108becf053341f6b19e57c93db44 /tmk_core/common
parentff8d9d41b84ac57f4bc4dc4237a8c8db838d7ddd (diff)
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>
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/action.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index dbde31caba..e3347d497a 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -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