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

Fixed an issue where reset_on_load images would not properly persist across emulation sessions (#2244)

Browse Source
This commit is contained in:
npwoods 2017-04-19 08:19:17 -04:00 committed by Olivier Galibert
parent 43b76a8a2f
commit fb7dd27728
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/emu/image.cpp
View File

@ -177,18 +177,23 @@ void image_manager::options_extract()
{ {
for (device_image_interface &image : image_interface_iterator(machine().root_device())) for (device_image_interface &image : image_interface_iterator(machine().root_device()))
{ {
// we have to assemble the image option differently for software lists and for normal images // only perform this activity for devices where is_reset_on_load() is false; for devices
std::string image_opt; // where this is true, manipulation of this value is done in reset_and_load()
if (image.exists()) if (!image.is_reset_on_load())
{ {
if (image.loaded_through_softlist()) // we have to assemble the image option differently for software lists and for normal images
image_opt = util::string_format("%s:%s:%s", image.software_list_name(), image.full_software_name(), image.brief_instance_name()); std::string image_opt;
else if (image.exists())
image_opt = image.filename(); {
} if (image.loaded_through_softlist())
image_opt = util::string_format("%s:%s:%s", image.software_list_name(), image.full_software_name(), image.brief_instance_name());
else
image_opt = image.filename();
}
// and set the option // and set the option
machine().options().image_options()[image.instance_name()] = std::move(image_opt); machine().options().image_options()[image.instance_name()] = std::move(image_opt);
}
} }
// write the config, if appropriate // write the config, if appropriate