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

This commit is contained in:
Miodrag Milanovic 2014-10-15 07:10:54 +00:00
parent 35dee95edf
commit a4dd32afb6

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());
} }