mirror of
https://github.com/holub/mame
synced 2025-06-07 05:13:46 +03:00
MT 04271: Merge attribute incorrectly matches parent NO_DUMP ROMs.
This commit is contained in:
parent
4e4b8426c5
commit
7f13992830
@ -467,12 +467,15 @@ static const char *get_merge_name(const hash_collection &romhashes, int parents,
|
|||||||
for (psource = rom_first_source(*pconfig); psource != NULL; psource = rom_next_source(*psource))
|
for (psource = rom_first_source(*pconfig); psource != NULL; psource = rom_next_source(*psource))
|
||||||
for (pregion = rom_first_region(*psource); pregion != NULL; pregion = rom_next_region(pregion))
|
for (pregion = rom_first_region(*psource); pregion != NULL; pregion = rom_next_region(pregion))
|
||||||
for (prom = rom_first_file(pregion); prom != NULL; prom = rom_next_file(prom))
|
for (prom = rom_first_file(pregion); prom != NULL; prom = rom_next_file(prom))
|
||||||
if (romhashes == hash_collection(ROM_GETHASHDATA(prom)))
|
{
|
||||||
|
hash_collection phashes(ROM_GETHASHDATA(prom));
|
||||||
|
if (!phashes.flag(hash_collection::FLAG_NO_DUMP) && romhashes == phashes)
|
||||||
{
|
{
|
||||||
merge_name = ROM_GETNAME(prom);
|
merge_name = ROM_GETNAME(prom);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return merge_name;
|
return merge_name;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user