Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-09 06:13:04 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolved bug MT05443 (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2014-02-06 07:47:34 +00:00
parent 81da493743
commit 299a6559b0
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emu/clifront.c
View File

@ -128,6 +128,13 @@ int cli_frontend::execute(int argc, char **argv)
// first parse options to be able to get software from it // first parse options to be able to get software from it
astring option_errors; astring option_errors;
m_options.parse_command_line(argc, argv, option_errors); m_options.parse_command_line(argc, argv, option_errors);
// We need to preprocess the config files once to determine the web server's configuration
// and file locations
if (m_options.read_config())
{
m_options.revert(OPTION_PRIORITY_INI);
m_options.parse_standard_inis(option_errors);
}
if (*(m_options.software_name()) != 0) if (*(m_options.software_name()) != 0)
{ {
const game_driver *system = m_options.system(); const game_driver *system = m_options.system();

8
src/emu/mame.c
View File

@ -148,14 +148,6 @@ int mame_execute(emu_options &options, osd_interface &osd)
bool exit_pending = false; bool exit_pending = false;
int error = MAMERR_NONE; int error = MAMERR_NONE;
// We need to preprocess the config files once to determine the web server's configuration
if (options.read_config())
{
options.revert(OPTION_PRIORITY_INI);
astring errors;
options.parse_standard_inis(errors);
}
web_engine web(options); web_engine web(options);
while (error == MAMERR_NONE && !exit_pending) while (error == MAMERR_NONE && !exit_pending)