diff options
| author |  Ted Lin <49993528+tedlinsonos@users.noreply.github.com> | 2020-02-09 23:50:45 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-02-10 04:50:45 +0000 |
| commit | c3200aa8fcf86122736846017ca7b125ac225842 (patch) | |
| tree | c0d40ba00f5ea9eb4126bcf9d188859ca914aced /tmk_core | |
| parent | 6052aa499e6fa6f2601d71b18301a76218944463 (diff) | |
| download | qmk_firmware-c3200aa8fcf86122736846017ca7b125ac225842.tar.gz | |
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')
| -rw-r--r-- | tmk_core/common/action.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index 5dadba4fb..d572b7056 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 |