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

frontend: Don't let the non-menus get as far as trying to draw.

Browse Source
This commit is contained in:
Vas Crabb 2021-11-04 10:32:24 +11:00
parent dc33e01896
commit 6e355f86c8
3 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,9 +74,9 @@ void menu_control_floppy_image::hook_load(const std::string &filename)
{ {
machine().popmessage("Error: %s\n", m_image.error()); machine().popmessage("Error: %s\n", m_image.error());
stack_pop(); stack_pop();
return;
} }
else
{
bool can_in_place = input_format->supports_save(); bool can_in_place = input_format->supports_save();
if(can_in_place) { if(can_in_place) {
std::string tmp_path; std::string tmp_path;
@ -92,6 +92,7 @@ void menu_control_floppy_image::hook_load(const std::string &filename)
menu::stack_push<menu_select_rw>(ui(), container(), can_in_place, m_submenu_result.rw); menu::stack_push<menu_select_rw>(ui(), container(), can_in_place, m_submenu_result.rw);
m_state = SELECT_RW; m_state = SELECT_RW;
} }
}
void menu_control_floppy_image::menu_activated() void menu_control_floppy_image::menu_activated()
{ {
@ -174,6 +175,7 @@ void menu_control_floppy_image::menu_activated()
case menu_select_rw::result::INVALID: case menu_select_rw::result::INVALID:
m_state = START_FILE; m_state = START_FILE;
menu_activated();
break; break;
} }
break; break;

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

@ -164,6 +164,7 @@ void menu_control_device_image::load_software_part()
{ {
machine().popmessage(_("The software selected is missing one or more required ROM or CHD images.\nPlease acquire the correct files or select a different one.")); machine().popmessage(_("The software selected is missing one or more required ROM or CHD images.\nPlease acquire the correct files or select a different one."));
m_state = SELECT_SOFTLIST; m_state = SELECT_SOFTLIST;
menu_activated();
} }
} }
@ -229,17 +230,22 @@ void menu_control_device_image::menu_activated()
if (!m_sld) if (!m_sld)
{ {
stack_pop(); stack_pop();
break;
} }
else
{
m_software_info_name.clear(); m_software_info_name.clear();
menu::stack_push_special_main<menu_software_list>(ui(), container(), m_sld, m_image.image_interface(), m_software_info_name); menu::stack_push_special_main<menu_software_list>(ui(), container(), m_sld, m_image.image_interface(), m_software_info_name);
m_state = SELECT_PARTLIST; m_state = SELECT_PARTLIST;
}
break; break;
case SELECT_PARTLIST: case SELECT_PARTLIST:
m_swi = m_sld->find(m_software_info_name); m_swi = m_sld->find(m_software_info_name);
if (!m_swi) if (!m_swi)
{
m_state = START_SOFTLIST; m_state = START_SOFTLIST;
menu_activated();
}
else if (m_swi->has_multiple_parts(m_image.image_interface())) else if (m_swi->has_multiple_parts(m_image.image_interface()))
{ {
m_submenu_result.swparts = menu_software_parts::result::INVALID; m_submenu_result.swparts = menu_software_parts::result::INVALID;
@ -263,6 +269,7 @@ void menu_control_device_image::menu_activated()
default: // return to list default: // return to list
m_state = SELECT_SOFTLIST; m_state = SELECT_SOFTLIST;
menu_activated();
break; break;
} }
break; break;