summaryrefslogtreecommitdiff
path: root/tmk_core/common/action.c
diff options
context:
space:
mode:
authorLuiz Ribeiro2017-07-04 11:17:28 -0400
committerLuiz Ribeiro2017-07-04 11:17:28 -0400
commitd5486265b8afcada68306c815b08c225fce287af (patch)
tree8fb7f8fee4aa3937003bd69d5c77ca867c010d12 /tmk_core/common/action.c
parent738b072bb0f25d0369a998c550c369e4f64cc7a5 (diff)
parent34c8bf47a76c8a2dcd3b1a19dd608f8fb2fafb31 (diff)
Merge branch 'master' into ps2avrGB
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 cffc0b9eb..84e661523 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