summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-12-06 04:27:05 +0000
committerQMK Bot <hello@qmk.fm>2021-12-06 04:27:05 +0000
commit42a5742add9e8233179ec3f1bb07c3e1efcc8593 (patch)
tree441580fc8219e62f343a84fa5af0e0a3e253fbdb
parent590082520ed7623ee41c5fb7266507a84e5a0b8b (diff)
parent6d0a62920410f50d7f6707960ca1ca0c8fd1d1fa (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/moonlander/moonlander.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index 3f9b3d40a4..d5105c26cd 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -400,6 +400,7 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_moonlander(
#ifdef ORYX_CONFIGURATOR
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_user(keycode, record)) { return false; }
switch (keycode) {
#ifdef WEBUSB_ENABLE
case WEBUSB_PAIR:
@@ -450,7 +451,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
return false;
#endif
}
- return process_record_user(keycode, record);
+ return true;
}
#endif
@@ -470,6 +471,7 @@ void matrix_init_kb(void) {
rgb_matrix_set_flags(LED_FLAG_NONE);
}
#endif
+ matrix_init_user();
}
void eeconfig_init_kb(void) { // EEPROM is getting reset!