summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend
diff options
context:
space:
mode:
authorGravatarGravatar Vas Crabb <vas@vastheman.com>2019-11-20 02:54:59 +1100
committerGravatarGravatar Vas Crabb <vas@vastheman.com>2019-11-20 02:54:59 +1100
commit228540e279df18da1dabec3819024c412ee7611e (patch)
treee4891f994d6ae51fff5daa9e146d4ef7f8a2984d /src/frontend
parentbdaaa0a558be81c80d8ea23720d82c57fbd0bb38 (diff)
restore code cleaning behaviour prior to ae2cc6853d935d3daeadd84b0b740af82ea9c41e - it's broken in some corner cases but the regressions are fixed
Diffstat (limited to 'src/frontend')
-rw-r--r--src/frontend/mame/ui/inputmap.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/frontend/mame/ui/inputmap.cpp b/src/frontend/mame/ui/inputmap.cpp
index 46ab0654320..16c91c5cb89 100644
--- a/src/frontend/mame/ui/inputmap.cpp
+++ b/src/frontend/mame/ui/inputmap.cpp
@@ -291,18 +291,17 @@ void menu_input::handle()
// if we are polling, handle as a special case
input_item_data *item = pollingitem;
- // if UI_CANCEL is pressed, abort
if (machine().ui_input().pressed(IPT_UI_CANCEL))
{
+ // if UI_CANCEL is pressed, abort
pollingitem = nullptr;
record_next = false;
toggle_none_default(item->seq, starting_seq, *item->defseq);
seqchangeditem = item;
}
-
- // poll again; if finished, update the sequence
- if (machine().input().seq_poll())
+ else if (machine().input().seq_poll())
{
+ // poll again; if finished, update the sequence
pollingitem = nullptr;
record_next = true;
item->seq = machine().input().seq_poll_final();