diff options
| author | That-Canadian <poole.chris.11@gmail.com> | 2017-08-09 23:17:48 -0400 |
|---|---|---|
| committer | That-Canadian <poole.chris.11@gmail.com> | 2017-08-09 23:17:48 -0400 |
| commit | 48a89ad8649ffe5fa054eccf1b0498f8a0a49b32 (patch) | |
| tree | 507acee914061af992dd8d657b2374da544c47ae /quantum/quantum.c | |
| parent | 597ff7aee9a04b4f4f41d6d1f5b2e1223e0e83b8 (diff) | |
| parent | a5ab2412ab6bb4df9be121faa8caaf900dc0ba0d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'quantum/quantum.c')
| -rw-r--r-- | quantum/quantum.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 1f8ce6c46f..0243a7e012 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -193,6 +193,10 @@ bool process_record_quantum(keyrecord_t *record) { // } if (!( + #if defined(KEY_LOCK_ENABLE) + // Must run first to be able to mask key_up events. + process_key_lock(&keycode, record) && + #endif process_record_kb(keycode, record) && #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED) process_midi(keycode, record) && |