jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Drashna Jaelre
2019-06-03 18:47:59 -07:00
committed by Florian Didron
parent 4cb92b05ed
commit bb71ba4b00
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@@ -24,3 +24,4 @@
05-16-2019 - Add RGB Light Effect Range functionality 05-16-2019 - Add RGB Light Effect Range functionality
05-26-2019 - Update templates to use proper debounce define 05-26-2019 - Update templates to use proper debounce define
05-26-2019 - Add Solus support for Linux install script 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)

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;
} }
} }
} }