Merge pull request #600 from ajrhacker/master

Ignore invalid default slot options in software lists
This commit is contained in:
Miodrag Milanović 2016-01-31 19:17:54 +01:00
commit 588ee94e9e

View file

@ -262,7 +262,7 @@ bool emu_options::add_slot_options(const software_part *swpart)
{
std::string featurename = std::string(name).append("_default");
const char *value = swpart->feature(featurename.c_str());
if (value != nullptr)
if (value != nullptr && (*value == '\0' || slot->option(value) != nullptr))
set_default_value(name, value);
}
}