summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/action.c
diff options
context:
space:
mode:
authorStick <nstickney@gmail.com>2017-06-22 13:06:30 -0500
committerStick <nstickney@gmail.com>2017-06-22 13:06:30 -0500
commitfa96d64f3761e6cd0661c63a3fc257b58c669be0 (patch)
tree85a7b88c4b1f3898c606af013a478db39dc392b5 /tmk_core/common/action.c
parent4b50ab029d49830cf0efd0e5e0606cb39c8dabae (diff)
parent2b98ec67f3c2e0e408275ea6b2c90be2dbeada23 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common/action.c')
-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