summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/action.c
diff options
context:
space:
mode:
authorAlex Johnstone <alexjj@gmail.com>2016-03-28 05:15:02 +0200
committerAlex Johnstone <alexjj@gmail.com>2016-03-28 05:15:02 +0200
commit97b431162c0345d64dd946bec0c0edb80906490a (patch)
treedab6b0b32bf8fb84c2cab0c74ae824374cad01a9 /tmk_core/common/action.c
parentd3e89b8cbd473ed8b712213104009f0a66432a13 (diff)
parent80eefb09ac5de95a6977702b4014d4b4d79a5d7d (diff)
downloadqmk_firmware-97b431162c0345d64dd946bec0c0edb80906490a.tar.gz
qmk_firmware-97b431162c0345d64dd946bec0c0edb80906490a.tar.xz
Merge pull request #4 from jackhumbert/master
upstream
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 77ea39e94..4197c53ed 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