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

Workaround for issue where the cannonical instance_name for a device was lost (#2248)

Browse Source 
This is a hack; details are in the source code.  I felt that it was too late in the 0.185 release cycle to do anything intrusive.  I intend to fix this "for real" when image/slot option morphing is encapsulated within emu_options.
This commit is contained in:
npwoods 2017-04-21 12:55:28 -04:00 committed by Olivier Galibert
parent 735ab4f355
commit 532f4ec861
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/emu/image.cpp
View File

@ -37,8 +37,34 @@ image_manager::image_manager(running_machine &machine)
if (!image.user_loadable())
continue;
// is an image specified for this image?
// find the image option in image_options()
auto iter = machine.options().image_options().find(image.instance_name());
// GROSS HACK - if we began our journey with a single device configuration (e.g. - a single
// cartridge system) but later added a device of that type, image.instance_name() will become
// something different. We're going to try to accomodate that specific scenario here
//
// Specific example: 'mame snes -cart1 sufami -cart2 poipoi' - the instance_name() starts out
// as "cartridge" but at the end becomes "cartridge1"
if (iter == machine.options().image_options().end()
&& (image.instance_name().rbegin() != image.instance_name().rend())
&& (*image.instance_name().rbegin() == '1'))
{
std::string alternate_instance_name = image.instance_name().substr(0, image.instance_name().size() - 1);
iter = machine.options().image_options().find(alternate_instance_name);
// If we found something, we need to write it back (so later checks work). We also need to redo
// the find; the act of erasing the old value breaks the iterator
if (iter != machine.options().image_options().end())
{
std::string temp = std::move(iter->second);
machine.options().image_options()[image.instance_name()] = std::move(temp);
machine.options().image_options().erase(alternate_instance_name);
iter = machine.options().image_options().find(image.instance_name());
}
}
// is an image specified for this image?
if (iter != machine.options().image_options().end() && !iter->second.empty())
{
// we do have a startup image specified - load it