Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
141214122d
@ -85,7 +85,7 @@ static void render_mod_status_gui_alt(uint8_t modifiers) {
|
||||
oled_write_P(gui_off_2, false);
|
||||
}
|
||||
|
||||
if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
|
||||
if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
|
||||
oled_write_P(on_on_2, false);
|
||||
} else if(modifiers & MOD_MASK_GUI) {
|
||||
oled_write_P(on_off_2, false);
|
||||
@ -151,7 +151,7 @@ static void render_mod_status_ctrl_shift(uint8_t modifiers) {
|
||||
oled_write_P(ctrl_off_2, false);
|
||||
}
|
||||
|
||||
if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
|
||||
if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
|
||||
oled_write_P(on_on_2, false);
|
||||
} else if(modifiers & MOD_MASK_CTRL) {
|
||||
oled_write_P(on_off_2, false);
|
||||
|
Loading…
Reference in New Issue
Block a user