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

This fixes issues where softlist items (that were not for floppies) were loaded from the software list menu

Browse Source 
I'm still not 100% satisfied with this patch.  While I got rid of the weird path when hook_proc() was called for a software list item,
I still don't like the whole m_init_phase infrastructure in devices, which seems to be an arbitrary piece of state.  Baby steps...
This commit is contained in:
Nathan Woods 2016-08-02 20:06:08 -04:00
parent b25aca6177
commit a9e706915c
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/diimage.cpp
View File

@ -1370,6 +1370,10 @@ bool device_image_interface::load_software_part(const char *path, const software
return false;
}
// I'm not sure what m_init_phase is all about; but for now I'm preserving this behavior
if (is_reset_on_load())
set_init_phase();
// Load the software part
software_list_device &swlist = swpart->info().list();
const char *swname = swpart->info().shortname().c_str();

10
src/frontend/mame/ui/floppycntrl.cpp
View File

@ -61,16 +61,8 @@ void menu_control_floppy_image::do_load_create()
}
}
void menu_control_floppy_image::hook_load(const std::string &filename, bool softlist)
void menu_control_floppy_image::hook_load(const std::string &filename)
{
if (softlist)
{
machine().popmessage("When loaded from software list, the disk is Read-only.\n");
m_image.load_software(filename);
stack_pop();
return;
}
input_filename = filename;
input_format = static_cast<floppy_image_device &>(m_image).identify(filename);

2
src/frontend/mame/ui/floppycntrl.h
View File

@ -33,7 +33,7 @@ private:
virtual void handle() override;
void do_load_create();
virtual void hook_load(const std::string &filename, bool softlist) override;
virtual void hook_load(const std::string &filename) override;
};
} // namespace ui

9
src/frontend/mame/ui/imgcntrl.cpp
View File

@ -140,7 +140,10 @@ void menu_control_device_image::load_software_part()
media_auditor::summary summary = auditor.audit_software(m_sld->list_name(), (software_info *)m_swi, AUDIT_VALIDATE_FAST);
// if everything looks good, load software
if (summary == media_auditor::CORRECT || summary == media_auditor::BEST_AVAILABLE || summary == media_auditor::NONE_NEEDED)
hook_load(temp_name, true);
{
m_image.load_software(temp_name);
stack_pop();
}
else
{
machine().popmessage(_("The software selected is missing one or more required ROM or CHD images. Please select a different one."));
@ -153,7 +156,7 @@ void menu_control_device_image::load_software_part()
// hook_load
//-------------------------------------------------
void menu_control_device_image::hook_load(const std::string &name, bool softlist)
void menu_control_device_image::hook_load(const std::string &name)
{
if (m_image.is_reset_on_load()) m_image.set_init_phase();
m_image.load(name);
@ -276,7 +279,7 @@ void menu_control_device_image::handle()
break;
case menu_file_selector::result::FILE:
hook_load(m_current_file, false);
hook_load(m_current_file);
break;
case menu_file_selector::result::CREATE:

2
src/frontend/mame/ui/imgcntrl.h
View File

@ -53,7 +53,7 @@ protected:
bool m_create_ok;
// methods
virtual void hook_load(const std::string &filename, bool softlist);
virtual void hook_load(const std::string &filename);
virtual void handle() override;
private: