Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-08 09:30:17 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

inputmap.cpp: Avert potential crash when populating DSW menu (nw)

Browse Source
This commit is contained in:
AJR 2017-10-18 20:47:05 -04:00
parent cffa7ecc34
commit aef651f228
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/frontend/mame/ui/inputmap.cpp
View File

@ -554,27 +554,30 @@ void menu_settings::populate(float &customtop, float &custombottom)
for (ioport_field &field : port.second->fields()) for (ioport_field &field : port.second->fields())
if (field.type() == type && field.enabled()) if (field.type() == type && field.enabled())
{ {
uint32_t flags = 0; if (!field.settings().empty())
/* set the left/right flags appropriately */
if (field.has_previous_setting())
flags |= FLAG_LEFT_ARROW;
if (field.has_next_setting())
flags |= FLAG_RIGHT_ARROW;
/* add the menu item */
if (strcmp(field.device().tag(), prev_owner.c_str()) != 0)
{ {
if (first_entry) uint32_t flags = 0;
first_entry = false;
else
item_append(menu_item_type::SEPARATOR);
string_format("[root%s]", field.device().tag());
item_append(string_format("[root%s]", field.device().tag()), "", 0, nullptr);
prev_owner.assign(field.device().tag());
}
item_append(field.name(), field.setting_name(), flags, (void *)&field); /* set the left/right flags appropriately */
if (field.has_previous_setting())
flags |= FLAG_LEFT_ARROW;
if (field.has_next_setting())
flags |= FLAG_RIGHT_ARROW;
/* add the menu item */
if (strcmp(field.device().tag(), prev_owner.c_str()) != 0)
{
if (first_entry)
first_entry = false;
else
item_append(menu_item_type::SEPARATOR);
string_format("[root%s]", field.device().tag());
item_append(string_format("[root%s]", field.device().tag()), "", 0, nullptr);
prev_owner.assign(field.device().tag());
}
item_append(field.name(), field.setting_name(), flags, (void *)&field);
}
/* for DIP switches, build up the model */ /* for DIP switches, build up the model */
if (type == IPT_DIPSWITCH && !field.diplocations().empty()) if (type == IPT_DIPSWITCH && !field.diplocations().empty())