summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorOfer Plesser <plesserofer@gmail.com>2016-12-16 21:00:29 +0100
committerOfer Plesser <plesserofer@gmail.com>2016-12-16 21:00:29 +0100
commit40abf8bc9ce22cab472f79e3a97c413ac5648986 (patch)
treeaed531d27d3660858a7192190ab8ac1e9a5b6f9d /quantum
parent6a462c818cc35ad5a51576bee96077d9614b1a8d (diff)
downloadqmk_firmware-40abf8bc9ce22cab472f79e3a97c413ac5648986.tar.gz
qmk_firmware-40abf8bc9ce22cab472f79e3a97c413ac5648986.tar.xz
Moved combo processing lower down in process logic
Diffstat (limited to 'quantum')
-rw-r--r--quantum/quantum.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 7767b6301..e5385bc21 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -113,9 +113,6 @@ bool process_record_quantum(keyrecord_t *record) {
if (!(
process_record_kb(keycode, record) &&
- #ifdef COMBO_ENABLE
- process_combo(keycode, record) &&
- #endif
#ifdef MIDI_ENABLE
process_midi(keycode, record) &&
#endif
@@ -131,6 +128,9 @@ bool process_record_quantum(keyrecord_t *record) {
#ifndef DISABLE_CHORDING
process_chording(keycode, record) &&
#endif
+ #ifdef COMBO_ENABLE
+ process_combo(keycode, record) &&
+ #endif
#ifdef UNICODE_ENABLE
process_unicode(keycode, record) &&
#endif