From d856998d53af5a1511ca8e0c6862e4f2894a1295 Mon Sep 17 00:00:00 2001
From: Kai Ryu <kai1103@gmail.com>
Date: Tue, 13 May 2014 14:10:56 +0900
Subject: [PATCH] Fix compatibility with NKRO

---
 common/action_util.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/common/action_util.c b/common/action_util.c
index e44b2142..de9522a0 100644
--- a/common/action_util.c
+++ b/common/action_util.c
@@ -145,7 +145,13 @@ void clear_oneshot_mods(void)
 uint8_t has_anykey(void)
 {
 #ifdef USB_6KRO_ENABLE
-    return cb_count;
+#ifdef NKRO_ENABLE
+    if (!keyboard_nkro) {
+#endif
+        return cb_count;
+#ifdef NKRO_ENABLE
+    }
+#endif
 #else
     uint8_t cnt = 0;
     for (uint8_t i = 1; i < REPORT_SIZE; i++) {
@@ -172,7 +178,14 @@ uint8_t get_first_key(void)
     }
 #endif
 #ifdef USB_6KRO_ENABLE
-    return keyboard_report->keys[cb_head];
+    uint8_t i = cb_head;
+    do {
+        if (keyboard_report->keys[i] != 0) {
+            break;
+        }
+        i = RO_INC(i);
+    } while (i != cb_tail);
+    return keyboard_report->keys[i];
 #else
     return keyboard_report->keys[0];
 #endif