diff options
author | Robbbert <Robbbert@users.noreply.github.com> | 2016-10-19 18:28:21 +1100 |
---|---|---|
committer | Robbbert <Robbbert@users.noreply.github.com> | 2016-10-19 18:28:21 +1100 |
commit | 50e65824109dcbfc50bf8d8ad78156b65d7c89ed (patch) | |
tree | 3fdb3b546ca61e618f9fa4c7b82ee815d2cab0cd | |
parent | 0b3660a9ca94ab8ddcdd9cc00379cb8a8030ca1c (diff) |
MT 03045: source.ini must now be in the source subfolder.
-rw-r--r-- | src/frontend/mame/mameopts.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/frontend/mame/mameopts.cpp b/src/frontend/mame/mameopts.cpp index 9b1150a9590..195fdff70bb 100644 --- a/src/frontend/mame/mameopts.cpp +++ b/src/frontend/mame/mameopts.cpp @@ -291,13 +291,9 @@ void mame_options::parse_standard_inis(emu_options &options, std::string &error_ } } - // next parse "source/<sourcefile>.ini"; if that doesn't exist, try <sourcefile>.ini + // next parse "source/<sourcefile>.ini" std::string sourcename = core_filename_extract_base(cursystem->source_file, true).insert(0, "source" PATH_SEPARATOR); - if (!parse_one_ini(options,sourcename.c_str(), OPTION_PRIORITY_SOURCE_INI, &error_string)) - { - sourcename = core_filename_extract_base(cursystem->source_file, true); - parse_one_ini(options,sourcename.c_str(), OPTION_PRIORITY_SOURCE_INI, &error_string); - } + parse_one_ini(options,sourcename.c_str(), OPTION_PRIORITY_SOURCE_INI, &error_string); // then parse the grandparent, parent, and system-specific INIs int parent = driver_list::clone(*cursystem); |