summaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-06-20 11:40:10 -0400
committerGitHub <noreply@github.com>2017-06-20 11:40:10 -0400
commit23df3016e89cc954d31d0f881587530543bc7242 (patch)
tree15b4643db6648f3279ac21dd03d3347323d1016c /tmk_core/common
parent9019d65b3c4b64ec4e7aedcbbdb57d5c46ee667f (diff)
parent74d752b531f4c5e90ceb3b8e55fdc68da35aa2ff (diff)
Merge pull request #1405 from cquiroz/oneshot-mods-timeout
Oneshot mods timeout
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 cffc0b9ebe..84e6615237 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -67,9 +67,11 @@ void action_exec(keyevent_t event)
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
if (has_oneshot_layer_timed_out()) {
- dprintf("Oneshot layer: timeout\n");
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
}
+ if (has_oneshot_mods_timed_out()) {
+ clear_oneshot_mods();
+ }
#endif
#ifndef NO_ACTION_TAPPING