Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-03 00:56:03 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix error in debug build with SMS card options (nw)

Browse Source
This commit is contained in:
AJR 2018-05-21 03:01:39 -04:00
parent d205197fe0
commit 1fe4b36065
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/emu/emuopts.cpp
View File

@ -383,13 +383,16 @@ namespace
std::vector<std::string> get_full_option_names(const device_image_interface &image) std::vector<std::string> get_full_option_names(const device_image_interface &image)
{ {
std::vector<std::string> result; std::vector<std::string> result;
bool same_name = image.instance_name() == image.brief_instance_name();
result.push_back(image.instance_name()); result.push_back(image.instance_name());
if (!same_name)
result.push_back(image.brief_instance_name()); result.push_back(image.brief_instance_name());
if (strcmp(image.device_typename(image.image_type()), image.instance_name().c_str()) == 0) if (strcmp(image.device_typename(image.image_type()), image.instance_name().c_str()) == 0)
{ {
result.push_back(image.instance_name() + "1"); result.push_back(image.instance_name() + "1");
if (!same_name)
result.push_back(image.brief_instance_name() + "1"); result.push_back(image.brief_instance_name() + "1");
} }
return result; return result;

2
src/lib/util/options.cpp
View File

@ -431,7 +431,7 @@ void core_options::add_entry(entry::shared_ptr &&entry, const char *after_header
void core_options::add_to_entry_map(std::string &&name, entry::shared_ptr &entry) void core_options::add_to_entry_map(std::string &&name, entry::shared_ptr &entry)
{ {
// it is illegal to call this method for something that already ex0ists // it is illegal to call this method for something that already exists
assert(m_entrymap.find(name) == m_entrymap.end()); assert(m_entrymap.find(name) == m_entrymap.end());
// append the entry // append the entry