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

Cleanup/bulletproofing to the issue Wizz just found

Browse Source
This commit is contained in:
Nathan Woods 2017-07-23 11:48:19 -04:00 committed by Vas Crabb
parent 769c2af968
commit 281223e497
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/emu/image.cpp
View File

@ -200,15 +200,12 @@ void image_manager::options_extract()
std::string image_opt;
if (image.exists())
{
if (image.loaded_through_softlist())
{
image_opt = util::string_format("%s:%s", image.software_list_name(), image.full_software_name());
const software_part *tmp = image.part_entry();
if (!tmp->name().empty())
image_opt.append(":").append(tmp->name());
}
else
if (!image.loaded_through_softlist())
image_opt = image.filename();
else if (image.part_entry() && !image.part_entry()->name().empty())
image_opt = util::string_format("%s:%s:%s", image.software_list_name(), image.full_software_name(), image.part_entry()->name());
else
image_opt = util::string_format("%s:%s", image.software_list_name(), image.full_software_name());
}
// and set the option (provided that it hasn't been removed out from under us)