Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-12 00:58:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Workaround for scenarios where both the command line and an INI specify an image option (#2245)

Browse Source 
This is a hack; see commentary within the code.  I intend to fix this "for real" when emu_options become more self contained
This commit is contained in:
npwoods 2017-04-19 08:19:26 -04:00 committed by Olivier Galibert
parent fb7dd27728
commit 87640fcc1c
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emu/emuopts.cpp
View File

@ -315,7 +315,17 @@ bool emu_options::override_set_value(const char *name, const std::string &value)
auto imageiter = m_image_options.find(name); auto imageiter = m_image_options.find(name);
if (imageiter != m_image_options.end()) if (imageiter != m_image_options.end())
{ {
imageiter->second = value; // We've found a potential image slot for this value. However, we're only going to specify it
// if the current image option is empty. This is because if there is an image option already
// present, it is almost certain that this was because something was specified at the command
// line and we're parsing an INI. Because INIs have less priority than the command line, this
// should be ignored
//
// Obviously, this ignores that INIs themselves have their own prioritization, so this should be
// considered to be a hack. Instead of having image options being just a straight map of std::string
// it should really be a structure where the priority can be recorded
if (imageiter->second.empty())
imageiter->second = value;
return true; return true;
} }