From: Ofer Plesser <plesserofer@gmail.com>
Date: Fri, 16 Dec 2016 20:00:29 +0000 (+0200)
Subject: Moved combo processing lower down in process logic
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=40abf8bc9ce22cab472f79e3a97c413ac5648986;p=qmk_firmware.git

Moved combo processing lower down in process logic
---

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