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

Fixed 2 bugs

Browse Source 
1. If either a multipart softlist item was loaded, or a single-part item loaded into a system with more than one of the same media slot, then a reset would cause a fatal error.
2. If a non-existing image was listed in the ini, it would fatal error at start and there was no way to fix it except by hand-editing the ini file. This restores the previous behaviour of ejecting the bad image with the first error.
This commit is contained in:
Robbbert 2017-05-25 23:58:51 +10:00
parent bdab5d00d2
commit 7346e19dfa
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/emu/image.cpp
View File

@ -89,8 +89,13 @@ image_manager::image_manager(running_machine &machine)
// retrieve image error message
std::string image_err = std::string(image.error());
// unload all images
unload_all();
// unload the bad image
image.unload();
// make sure it is removed from the ini file too
machine.options().image_options()[image.instance_name()] = "";
if (machine.options().write_config())
write_config(machine.options(), nullptr, &machine.system());
fatalerror_exitcode(machine, EMU_ERR_DEVICE, "Device %s load (%s) failed: %s",
image.device().name(),
@ -212,7 +217,7 @@ void image_manager::options_extract()
if (image.exists())
{
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());
image_opt = util::string_format("%s:%s", image.software_list_name(), image.full_software_name());
else
image_opt = image.filename();
}