summaryrefslogtreecommitdiff
path: root/tmk_core/common/action.c
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-03-28 11:29:54 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-03-28 11:29:54 -0400
commit95a88c09e18a7531a64838ceaa52df37bad8dc0d (patch)
treee108b87cbe318ff4824509be19209b010101d419 /tmk_core/common/action.c
parenta4ff9f256738cf637553e7840d53f778d791fb6f (diff)
parent80eefb09ac5de95a6977702b4014d4b4d79a5d7d (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common/action.c')
-rw-r--r--tmk_core/common/action.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 77ea39e942..4197c53ed2 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -70,6 +70,10 @@ void process_action(keyrecord_t *record)
#endif
dprintln();
+ if (event.pressed) {
+ // clear the potential weak mods left by previously pressed keys
+ clear_weak_mods();
+ }
switch (action.kind.id) {
/* Key and Mods */
case ACT_LMODS:
@@ -500,6 +504,7 @@ void clear_keyboard(void)
void clear_keyboard_but_mods(void)
{
clear_weak_mods();
+ clear_macro_mods();
clear_keys();
send_keyboard_report();
#ifdef MOUSEKEY_ENABLE