summaryrefslogtreecommitdiff
path: root/tmk_core/common/action.c
diff options
context:
space:
mode:
authorIBNobody <ibnobody@gmail.com>2016-03-27 16:17:26 -0500
committerIBNobody <ibnobody@gmail.com>2016-03-27 16:17:26 -0500
commitb7f0110d71bade83609d7a5c0b4243e521882e31 (patch)
tree3c5176ee8dfdadd4429b709e8c2cabcaff84f063 /tmk_core/common/action.c
parent987ee1115e118c654d67a5ca1faea05beec5c6f2 (diff)
parent80eefb09ac5de95a6977702b4014d4b4d79a5d7d (diff)
downloadqmk_firmware-b7f0110d71bade83609d7a5c0b4243e521882e31.tar.gz
qmk_firmware-b7f0110d71bade83609d7a5c0b4243e521882e31.zip
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
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