Merged with Vojtech's branch

This commit is contained in:
bubnikv 2018-04-13 16:19:27 +02:00
commit c5af8bfe78
18 changed files with 365 additions and 100 deletions

View file

@ -713,8 +713,7 @@ size_t PresetBundle::load_configbundle(const std::string &path, unsigned int fla
const VendorProfile *vendor_profile = nullptr;
if (flags & (LOAD_CFGBNDLE_SYSTEM | LOAD_CFGBUNDLE_VENDOR_ONLY)) {
boost::filesystem::path fspath(path);
auto vp = VendorProfile::from_ini(tree, fspath.stem().string());
auto vp = VendorProfile::from_ini(tree, path);
if (vp.num_variants() == 0)
return 0;
vendor_profile = &(*this->vendors.insert(vp).first);