From 7f139928303f19c966bd99607fb39482adb1bc60 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Tue, 8 Mar 2011 04:56:27 +0000 Subject: [PATCH] MT 04271: Merge attribute incorrectly matches parent NO_DUMP ROMs. --- src/emu/info.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/emu/info.c b/src/emu/info.c index 188c5e2304b..40b3f3ca187 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -467,11 +467,14 @@ 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 (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)) - 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); break; } + } } return merge_name;