diff options
| author | Jack Humbert <[email protected]> | 2016-09-23 15:26:28 -0400 | 
|---|---|---|
| committer | GitHub <[email protected]> | 2016-09-23 15:26:28 -0400 | 
| commit | 3d42d60b7f778d20f11f058aa278effce2bdb9c1 (patch) | |
| tree | cd0abce1a6488ba9750ed7958b80ab157e264f48 /tmk_core/common/action.c | |
| parent | ce6a9a6c38a3efb2b3d403d5b3549b2190102cf3 (diff) | |
| parent | d4309990472895bbbe82f7ba22ed33c16f928778 (diff) | |
| download | qmk_firmware-3d42d60b7f778d20f11f058aa278effce2bdb9c1.tar.gz qmk_firmware-3d42d60b7f778d20f11f058aa278effce2bdb9c1.zip | |
Merge pull request #776 from DidierLoiseau/issue-772
Fix issue #772 Meh and Hyper not working
Diffstat (limited to 'tmk_core/common/action.c')
| -rw-r--r-- | tmk_core/common/action.c | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index 08ef22eb97..d485b46c77 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -155,9 +155,10 @@ void process_action(keyrecord_t *record, action_t action)                                                                  action.key.mods<<4;                  if (event.pressed) {                      if (mods) { -                        if (IS_MOD(action.key.code)) { +                        if (IS_MOD(action.key.code) || action.key.code == KC_NO) {                              // e.g. LSFT(KC_LGUI): we don't want the LSFT to be weak as it would make it useless. -                            // this also makes LSFT(KC_LGUI) behave exactly the same as LGUI(KC_LSFT) +                            // This also makes LSFT(KC_LGUI) behave exactly the same as LGUI(KC_LSFT). +                            // Same applies for some keys like KC_MEH which are declared as MEH(KC_NO).                              add_mods(mods);                          } else {                              add_weak_mods(mods); @@ -168,7 +169,7 @@ void process_action(keyrecord_t *record, action_t action)                  } else {                      unregister_code(action.key.code);                      if (mods) { -                        if (IS_MOD(action.key.code)) { +                        if (IS_MOD(action.key.code) || action.key.code == KC_NO) {                              del_mods(mods);                          } else {                              del_weak_mods(mods); | 
