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

Better fix for init order on software item load (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2014-10-15 07:10:54 +00:00
parent 35dee95edf
commit a4dd32afb6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emu/ui/imgcntrl.c
View File

@ -132,7 +132,6 @@ void ui_menu_control_device_image::test_create(bool &can_create, bool &need_conf
void ui_menu_control_device_image::load_software_part() void ui_menu_control_device_image::load_software_part()
{ {
astring temp_name(sld->list_name(), ":", swi->shortname(), ":", swp->name()); astring temp_name(sld->list_name(), ":", swi->shortname(), ":", swp->name());
image->set_init_phase();
hook_load(temp_name, true); hook_load(temp_name, true);
} }
@ -143,6 +142,7 @@ void ui_menu_control_device_image::load_software_part()
void ui_menu_control_device_image::hook_load(astring name, bool softlist) void ui_menu_control_device_image::hook_load(astring name, bool softlist)
{ {
if (image->is_reset_on_load()) image->set_init_phase();
image->load(name); image->load(name);
ui_menu::stack_pop(machine()); ui_menu::stack_pop(machine());
} }
@ -205,15 +205,15 @@ void ui_menu_control_device_image::handle()
case SELECT_PARTLIST: case SELECT_PARTLIST:
swi = sld->find(software_info_name); swi = sld->find(software_info_name);
if (!swi) if (!swi)
state = START_SOFTLIST; state = START_SOFTLIST;
else if(swi->has_multiple_parts(image->image_interface())) else if(swi->has_multiple_parts(image->image_interface()))
{ {
submenu_result = -1; submenu_result = -1;
swp = 0; swp = 0;
ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_software_parts(machine(), container, swi, image->image_interface(), &swp, false, &submenu_result))); ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_software_parts(machine(), container, swi, image->image_interface(), &swp, false, &submenu_result)));
state = SELECT_ONE_PART; state = SELECT_ONE_PART;
} }
else else
{ {
swp = swi->first_part(); swp = swi->first_part();
load_software_part(); load_software_part();
@ -256,7 +256,7 @@ void ui_menu_control_device_image::handle()
state = START_SOFTLIST; state = START_SOFTLIST;
handle(); handle();
break; break;
case -1: // return to system case -1: // return to system
ui_menu::stack_pop(machine()); ui_menu::stack_pop(machine());
break; break;