diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-06-03 18:47:59 -0700 |
|---|---|---|
| committer | Florian Didron <fdidron@users.noreply.github.com> | 2019-06-04 09:47:59 +0800 |
| commit | bb71ba4b00e596e69210f90ae4497dc259e0ce42 (patch) | |
| tree | d9f1dd13050ce840370666ad6670335a6b9f23dd | |
| parent | 4cb92b05ed86a956fc4c8c9fee6004b4d5fb704c (diff) | |
Fix TO() and DF() calling layer_state_set_[kb,user] twice (#6003) (#62)
| -rw-r--r-- | changelog.md | 3 | ||||
| -rw-r--r-- | tmk_core/common/action.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/changelog.md b/changelog.md index 4e294042e4..68949901e4 100644 --- a/changelog.md +++ b/changelog.md @@ -23,4 +23,5 @@ 05-06-2019 - Changes to Split Common and OLED code 05-16-2019 - Add RGB Light Effect Range functionality 05-26-2019 - Update templates to use proper debounce define -05-26-2019 - Add Solus support for Linux install script
\ No newline at end of file +05-26-2019 - Add Solus support for Linux install script +05-29-2019 - Fix TO() and DF() calling layer_state_set_[kb,user] twice (qmk#6003)
\ No newline at end of file diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index bb4e66c9c8..cb7e2b5e54 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -412,7 +412,7 @@ void process_action(keyrecord_t *record, action_t action) case OP_BIT_AND: default_layer_and(bits | mask); break; case OP_BIT_OR: default_layer_or(bits | mask); break; case OP_BIT_XOR: default_layer_xor(bits | mask); break; - case OP_BIT_SET: default_layer_and(mask); default_layer_or(bits); break; + case OP_BIT_SET: default_layer_set(bits | mask); break; } } } else { @@ -426,7 +426,7 @@ void process_action(keyrecord_t *record, action_t action) case OP_BIT_AND: layer_and(bits | mask); break; case OP_BIT_OR: layer_or(bits | mask); break; case OP_BIT_XOR: layer_xor(bits | mask); break; - case OP_BIT_SET: layer_and(mask); layer_or(bits); break; + case OP_BIT_SET: layer_state_set(bits | mask); break; } } } |