summaryrefslogtreecommitdiff
path: root/users/ninjonas
diff options
context:
space:
mode:
authorstein3 <stein3@gmail.com>2020-10-06 07:15:41 -0700
committerstein3 <stein3@gmail.com>2020-10-06 07:15:41 -0700
commit2e402741a89c5eec8cf30c966ce6f36d6ec9249b (patch)
tree3592e8c5e6bd19943ae55db7fc02a5f755afbb51 /users/ninjonas
parent3e5e4f74272c610bb9fa737f674f8e65ed6100ca (diff)
parent2013f6313430b977e557e482d30daa279a46e75d (diff)
Merge branch 'master' into meteor
Diffstat (limited to 'users/ninjonas')
-rw-r--r--users/ninjonas/combos.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/users/ninjonas/combos.c b/users/ninjonas/combos.c
index 9453ba84dc..8d1cd6510f 100644
--- a/users/ninjonas/combos.c
+++ b/users/ninjonas/combos.c
@@ -23,7 +23,7 @@ combo_t key_combos[COMBO_COUNT] = {
[XV_PASTE] = COMBO_ACTION(paste_combo),
};
-void process_combo_event(uint8_t combo_index, bool pressed) {
+void process_combo_event(uint16_t combo_index, bool pressed) {
switch(combo_index) {
case EQ_QUIT:
if (pressed) {