_/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix TO() and DF() calling layer_state_set_[kb,user] twice (#6003)

Browse source
This commit is contained in:
fauxpark 2019-05-30 00:45:28 +10:00 committed by MechMerlin
parent 287767bba1
commit d16056e60a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tmk_core/common/action.c
View file

@ -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_AND: default_layer_and(bits | mask); break;
case OP_BIT_OR: default_layer_or(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_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 { } 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_AND: layer_and(bits | mask); break;
case OP_BIT_OR: layer_or(bits | mask); break; case OP_BIT_OR: layer_or(bits | mask); break;
case OP_BIT_XOR: layer_xor(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;
} }
} }
} }