]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Moved combo processing lower down in process logic
authorOfer Plesser <plesserofer@gmail.com>
Fri, 16 Dec 2016 20:00:29 +0000 (22:00 +0200)
committerOfer Plesser <plesserofer@gmail.com>
Fri, 16 Dec 2016 20:00:29 +0000 (22:00 +0200)
quantum/quantum.c

index 7767b63016a6d3d238bcabe2892347e1add08ada..e5385bc21c3471dd7ebdbb4ed5582481ef0c65d1 100644 (file)
@@ -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