From c0c2ce52e1b8d699da3cbfc2cc2febf1fc299ade Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 5 Dec 2011 13:52:38 +0000 Subject: [PATCH] Fix for listxml (no whatsnew) --- src/emu/info.c | 8 ++++---- src/emu/info.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/emu/info.c b/src/emu/info.c index f663adf0203..698f5d63e3e 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -199,8 +199,10 @@ extern int m_device_count; info_xml_creator::info_xml_creator(driver_enumerator &drivlist) : m_output(NULL), - m_drivlist(drivlist) + m_drivlist(drivlist), + m_lookup_options(m_drivlist.options()) { + m_lookup_options.remove_device_options(); } @@ -1276,13 +1278,11 @@ void info_xml_creator::output_ramoptions() const char *info_xml_creator::get_merge_name(const hash_collection &romhashes) { const char *merge_name = NULL; - emu_options lookup_options(m_drivlist.options()); - lookup_options.remove_device_options(); // walk the parent chain for (int clone_of = m_drivlist.find(m_drivlist.driver().parent); clone_of != -1; clone_of = m_drivlist.find(m_drivlist.driver(clone_of).parent)) // look in the parent's ROMs - for (const rom_source *psource = rom_first_source(m_drivlist.config(clone_of,lookup_options)); psource != NULL; psource = rom_next_source(*psource)) + for (const rom_source *psource = rom_first_source(m_drivlist.config(clone_of,m_lookup_options)); psource != NULL; psource = rom_next_source(*psource)) for (const rom_entry *pregion = rom_first_region(*psource); pregion != NULL; pregion = rom_next_region(pregion)) for (const rom_entry *prom = rom_first_file(pregion); prom != NULL; prom = rom_next_file(prom)) { diff --git a/src/emu/info.h b/src/emu/info.h index 41d6443e556..34a1137ff0c 100644 --- a/src/emu/info.h +++ b/src/emu/info.h @@ -86,6 +86,7 @@ private: FILE * m_output; driver_enumerator & m_drivlist; UINT8 * m_device_used; + emu_options m_lookup_options; static const char s_dtd_string[]; };