Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-31 10:01:51 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

uiswlist: fixed a subtle (and longstanding) bug where the file manager was crashing if a software list had an item with no compatible interface for the chosen image device (might happen if we allow for lists of mixed media). no whatsnew.

Browse Source
This commit is contained in:
Fabio Priuli 2011-12-20 23:34:57 +00:00
parent a682c9d1ef
commit cab1345f1c
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/emu/uiswlist.c
View File

@ -133,12 +133,14 @@ ui_menu_software_entry_info *ui_menu_software_list::append_software_entry(softwa
ui_menu_software_entry_info *entry = NULL;
ui_menu_software_entry_info **entryptr;
const char *interface = image->image_interface();
bool entry_updated = FALSE;
// check if at least one of the parts has the correct interface and add a menu entry only in this case
for (software_part *swpart = software_find_part(swinfo, NULL, NULL); swpart != NULL; swpart = software_part_next(swpart))
{
if (strcmp(interface, swpart->interface_) == 0)
{
entry_updated = TRUE;
// allocate a new entry
entry = (ui_menu_software_entry_info *) m_pool_alloc(sizeof(*entry));
memset(entry, 0, sizeof(*entry));
@ -152,14 +154,18 @@ ui_menu_software_entry_info *ui_menu_software_list::append_software_entry(softwa
}
}
// find the end of the list
entryptr = &entrylist;
while ((*entryptr != NULL) && (compare_entries(entry, *entryptr, ordered_by_shortname) >= 0))
entryptr = &(*entryptr)->next;
// skip this if no new entry has been allocated (e.g. if the software has no matching interface for this image device)
if (entry_updated)
{
// find the end of the list
entryptr = &entrylist;
while ((*entryptr != NULL) && (compare_entries(entry, *entryptr, ordered_by_shortname) >= 0))
entryptr = &(*entryptr)->next;
// insert the entry
entry->next = *entryptr;
*entryptr = entry;
// insert the entry
entry->next = *entryptr;
*entryptr = entry;
}
return entry;
}