summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2020-07-10 11:03:52 +0200
committer hap <happppp@users.noreply.github.com>2020-07-10 11:03:52 +0200
commit96020b3f89b56e0187adc115f0b71d014c67b100 (patch)
tree4e4a2e3748ea2599a914909648c2a28d8e75f303
parent3db9e11031c1eed826eacd12f6827d80f06413b8 (diff)
ui: swap order of popup screens (gameinfo first, warnings second), add "press any key" to gameinfo
-rw-r--r--src/frontend/mame/ui/ui.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
index e1b0990193b..f1744ff76e9 100644
--- a/src/frontend/mame/ui/ui.cpp
+++ b/src/frontend/mame/ui/ui.cpp
@@ -331,21 +331,24 @@ void mame_ui_manager::display_startup_screens(bool first_time)
switch (state)
{
case 0:
- messagebox_text = machine_info().warnings_string();
- m_has_warnings = !messagebox_text.empty();
- if (m_has_warnings && show_warnings)
+ if (show_gameinfo)
+ messagebox_text = machine_info().game_info_string();
+ if (!messagebox_text.empty())
{
messagebox_text.append("\n\nPress any key to continue");
set_handler(ui_callback_type::MODAL, std::bind(&mame_ui_manager::handler_messagebox_anykey, this, _1));
- messagebox_backcolor = machine_info().warnings_color();
}
break;
case 1:
- if (show_gameinfo)
- messagebox_text = machine_info().game_info_string();
- if (!messagebox_text.empty())
+ messagebox_text = machine_info().warnings_string();
+ m_has_warnings = !messagebox_text.empty();
+ if (m_has_warnings && show_warnings)
+ {
+ messagebox_text.append("\n\nPress any key to continue");
set_handler(ui_callback_type::MODAL, std::bind(&mame_ui_manager::handler_messagebox_anykey, this, _1));
+ messagebox_backcolor = machine_info().warnings_color();
+ }
break;
case 2: