summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2019-08-06 14:40:46 -0400
committer GitHub <noreply@github.com>2019-08-06 14:40:46 -0400
commit9bfa3c77c482642fb38fb192521dc15593387acc (patch)
tree02d034432adfa138de77d8a0d7f0c1b1aee85986
parentfff1fe468bb842542917b569764364c57681a65e (diff)
parent6ddad43360bb7caff88c7461fc4d54a96773bb4f (diff)
Merge pull request #5448 from npwoods/ignore_mandatory_with_str
Surpressing mandatory file manager when -str (seconds to run) is on (nw)
-rw-r--r--src/frontend/mame/ui/ui.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
index ce1ea2855c1..3a9151f1f2e 100644
--- a/src/frontend/mame/ui/ui.cpp
+++ b/src/frontend/mame/ui/ui.cpp
@@ -303,13 +303,13 @@ void mame_ui_manager::display_startup_screens(bool first_time)
const int maxstate = 3;
int str = machine().options().seconds_to_run();
bool show_gameinfo = !machine().options().skip_gameinfo();
- bool show_warnings = true;
+ bool show_warnings = true, show_mandatory_fileman = true;
bool video_none = strcmp(downcast<osd_options &>(machine().options()).video(), "none") == 0;
// disable everything if we are using -str for 300 or fewer seconds, or if we're the empty driver,
// or if we are debugging, or if there's no mame window to send inputs to
if (!first_time || (str > 0 && str < 60*5) || &machine().system() == &GAME_NAME(___empty) || (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0 || video_none)
- show_gameinfo = show_warnings = false;
+ show_gameinfo = show_warnings = show_mandatory_fileman = false;
#if defined(EMSCRIPTEN)
// also disable for the JavaScript port since the startup screens do not run asynchronously
@@ -347,7 +347,7 @@ void mame_ui_manager::display_startup_screens(bool first_time)
case 2:
std::vector<std::reference_wrapper<const std::string>> mandatory_images = mame_machine_manager::instance()->missing_mandatory_images();
- if (!mandatory_images.empty())
+ if (!mandatory_images.empty() && show_mandatory_fileman)
{
std::ostringstream warning;
warning << _("This driver requires images to be loaded in the following device(s): ");