diff options
| author | fauxpark <fauxpark@gmail.com> | 2019-05-30 00:45:28 +1000 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-05-29 07:45:28 -0700 |
| commit | d16056e60a4ac20ad4b2d7bef3ecebe82d22674b (patch) | |
| tree | 1f5fc13f94222b2cab197f709ddd334af4544a31 /tmk_core | |
| parent | 287767bba10ac866fae2ffadd45b2315c1e184e6 (diff) | |
| download | qmk_firmware-d16056e60a4ac20ad4b2d7bef3ecebe82d22674b.tar.gz qmk_firmware-d16056e60a4ac20ad4b2d7bef3ecebe82d22674b.zip | |
Fix TO() and DF() calling layer_state_set_[kb,user] twice (#6003)
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/action.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index 3991a8a9e..6a560229a 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) | |||
| 412 | case OP_BIT_AND: default_layer_and(bits | mask); break; | 412 | case OP_BIT_AND: default_layer_and(bits | mask); break; |
| 413 | case OP_BIT_OR: default_layer_or(bits | mask); break; | 413 | case OP_BIT_OR: default_layer_or(bits | mask); break; |
| 414 | case OP_BIT_XOR: default_layer_xor(bits | mask); break; | 414 | case OP_BIT_XOR: default_layer_xor(bits | mask); break; |
| 415 | case OP_BIT_SET: default_layer_and(mask); default_layer_or(bits); break; | 415 | case OP_BIT_SET: default_layer_set(bits | mask); break; |
| 416 | } | 416 | } |
| 417 | } | 417 | } |
| 418 | } else { | 418 | } else { |
| @@ -426,7 +426,7 @@ void process_action(keyrecord_t *record, action_t action) | |||
| 426 | case OP_BIT_AND: layer_and(bits | mask); break; | 426 | case OP_BIT_AND: layer_and(bits | mask); break; |
| 427 | case OP_BIT_OR: layer_or(bits | mask); break; | 427 | case OP_BIT_OR: layer_or(bits | mask); break; |
| 428 | case OP_BIT_XOR: layer_xor(bits | mask); break; | 428 | case OP_BIT_XOR: layer_xor(bits | mask); break; |
| 429 | case OP_BIT_SET: layer_and(mask); layer_or(bits); break; | 429 | case OP_BIT_SET: layer_state_set(bits | mask); break; |
| 430 | } | 430 | } |
| 431 | } | 431 | } |
| 432 | } | 432 | } |