diff options
| author | Erez Zukerman <ezuk@madmimi.com> | 2016-09-23 20:57:41 -0400 |
|---|---|---|
| committer | Erez Zukerman <ezuk@madmimi.com> | 2016-09-23 20:57:41 -0400 |
| commit | 67252625165ffa0a08e723a52562a853aa4b496b (patch) | |
| tree | 590591f00a3782b43253a1321220c7652cd9799b /tmk_core/common/action.c | |
| parent | 1a96b2cdc8895bd9f219e6c793aeee6ff7ce81f6 (diff) | |
| parent | e1fa9073c263d260fc0ec3c0d2d8a6a6f5aee42e (diff) | |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
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); |