Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Further tweaks to command verb behavior (nw)

Browse Source 
- Extend slot option processing to the -listdevices command as well
- Don't try adding any system-specific options when a wildcard is specified
This commit is contained in:
AJR 2017-05-20 01:30:51 -04:00
parent a0a94606b6
commit f21e68092f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/mame/clifront.cpp
View File

@ -1458,7 +1458,7 @@ const cli_frontend::info_command_struct *cli_frontend::find_command(const std::s
{ CLICOMMAND_LISTCLONES, 0, 1, false, &cli_frontend::listclones, "[system name]" },
{ CLICOMMAND_LISTBROTHERS, 0, 1, false, &cli_frontend::listbrothers, "[system name]" },
{ CLICOMMAND_LISTCRC, 0, 1, false, &cli_frontend::listcrc, "[system name]" },
{ CLICOMMAND_LISTDEVICES, 0, 1, false, &cli_frontend::listdevices, "[system name]" },
{ CLICOMMAND_LISTDEVICES, 0, 1, true, &cli_frontend::listdevices, "[system name]" },
{ CLICOMMAND_LISTSLOTS, 0, 1, true, &cli_frontend::listslots, "[system name]" },
{ CLICOMMAND_LISTROMS, 0, -1, false, &cli_frontend::listroms, "[pattern] ..." },
{ CLICOMMAND_LISTSAMPLES, 0, 1, false, &cli_frontend::listsamples, "[system name]" },

3
src/frontend/mame/mameopts.cpp
View File

@ -359,7 +359,8 @@ bool mame_options::parse_command_line(emu_options &options, std::vector<std::str
// out if this is necessary for this particular auxillary verb, and if so, set the system name
if (!options.command().empty()
&& cli_frontend::parse_slot_options_for_auxverb(options.command())
&& !options.command_arguments().empty())
&& !options.command_arguments().empty()
&& !core_iswildstr(options.command_arguments()[0].c_str()))
{
std::string error_string;
options.set_value(OPTION_SYSTEMNAME, options.command_arguments()[0].c_str(), OPTION_PRIORITY_CMDLINE, error_string);