diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-06-20 11:40:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 11:40:10 -0400 |
| commit | 23df3016e89cc954d31d0f881587530543bc7242 (patch) | |
| tree | 15b4643db6648f3279ac21dd03d3347323d1016c | |
| parent | 9019d65b3c4b64ec4e7aedcbbdb57d5c46ee667f (diff) | |
| parent | 74d752b531f4c5e90ceb3b8e55fdc68da35aa2ff (diff) | |
| download | qmk_firmware-23df3016e89cc954d31d0f881587530543bc7242.tar.gz qmk_firmware-23df3016e89cc954d31d0f881587530543bc7242.zip | |
Merge pull request #1405 from cquiroz/oneshot-mods-timeout
Oneshot mods timeout
| -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 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) | |||
| 67 | 67 | ||
| 68 | #if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) | 68 | #if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) |
| 69 | if (has_oneshot_layer_timed_out()) { | 69 | if (has_oneshot_layer_timed_out()) { |
| 70 | dprintf("Oneshot layer: timeout\n"); | ||
| 71 | clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); | 70 | clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); |
| 72 | } | 71 | } |
| 72 | if (has_oneshot_mods_timed_out()) { | ||
| 73 | clear_oneshot_mods(); | ||
| 74 | } | ||
| 73 | #endif | 75 | #endif |
| 74 | 76 | ||
| 75 | #ifndef NO_ACTION_TAPPING | 77 | #ifndef NO_ACTION_TAPPING |
