From 36406e792ed61fe1ffbea9f1efabc25fe9a336c4 Mon Sep 17 00:00:00 2001 From: AJR Date: Fri, 31 Mar 2017 16:51:28 -0400 Subject: [PATCH] UI input map fixes - Fix a longstanding bug that prevented binding several ORed buttons to any input belonging to a non-root device. - Fix a visual glitch when assigning inputs to analog sequences. --- src/frontend/mame/ui/inputmap.cpp | 2 +- src/frontend/mame/ui/inputmap.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/mame/ui/inputmap.cpp b/src/frontend/mame/ui/inputmap.cpp index 72568523e87..5a56aee53c4 100644 --- a/src/frontend/mame/ui/inputmap.cpp +++ b/src/frontend/mame/ui/inputmap.cpp @@ -426,7 +426,7 @@ void menu_input::populate_and_sort(input_item_data *itemlist) text = "(" + text + ")"; /* if we're polling this item, use some spaces with left/right arrows */ - if (pollingref == item->ref) + if (pollingref == item->ref && pollingseq == item->seqtype) { subtext.assign(" "); flags |= FLAG_LEFT_ARROW | FLAG_RIGHT_ARROW; diff --git a/src/frontend/mame/ui/inputmap.h b/src/frontend/mame/ui/inputmap.h index 5962d3e592e..ba48e7dee9f 100644 --- a/src/frontend/mame/ui/inputmap.h +++ b/src/frontend/mame/ui/inputmap.h @@ -66,7 +66,7 @@ protected: input_item_data * pollingitem; private: - uint16_t last_sortorder; + uint32_t last_sortorder; bool record_next; input_seq starting_seq;