Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed an issue that could cause problems when loading reset_on_load devices (like cartridges) from softlists at runtime

Browse Source 
This was not guaranteed to cause a problem; the specific issue here was reported by mr_gw in the context of the CoCo, and the proximate issue (hanging) was in CoCo-specific code.   That said, this could cause problems elsewhere.
This commit is contained in:
Nathan Woods 2017-04-29 19:43:05 -04:00 committed by Vas Crabb
parent 2d669bcb96
commit 0514442753
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/emu/diimage.cpp
View File

@ -1082,6 +1082,13 @@ image_init_result device_image_interface::load(const std::string &path)
image_init_result device_image_interface::load_software(const std::string &software_identifier)
{
// Is this a software part that forces a reset and we're at runtime? If so, get this loaded through reset_and_load
if (is_reset_on_load() && !init_phase())
{
reset_and_load(software_identifier);
return image_init_result::PASS;
}
// Prepare to load
unload();
clear_error();
@ -1410,13 +1417,6 @@ bool device_image_interface::load_software_part(const std::string &identifier)
return false;
}
// Is this a software part that forces a reset and we're at runtime? If so, get this loaded through reset_and_load
if (is_reset_on_load() && !init_phase())
{
reset_and_load(identifier);
return true;
}
// Load the software part
const char *swname = m_software_part_ptr->info().shortname().c_str();
const rom_entry *start_entry = m_software_part_ptr->romdata().data();

2
src/emu/diimage.h
View File

@ -278,7 +278,6 @@ protected:
void image_checkhash();
const software_part *find_software_item(const std::string &identifier, bool restrict_to_interface, software_list_device **device = nullptr) const;
bool load_software_part(const std::string &identifier);
std::string software_get_default_slot(const char *default_card_slot) const;
void add_format(std::unique_ptr<image_device_format> &&format);
@ -311,6 +310,7 @@ private:
static image_error_t image_error_from_file_error(osd_file::error filerr);
std::vector<u32> determine_open_plan(bool is_create);
void update_names();
bool load_software_part(const std::string &identifier);
bool init_phase() const;
static void run_hash(util::core_file &file, void(*partialhash)(util::hash_collection &, const unsigned char *, unsigned long, const char *), util::hash_collection &hashes, const char *types);