Fix DDF matching manufacturer name constant strings
@@ -487,10 +487,11 @@ const DeviceDescription &DeviceDescriptions::get(const Resource *resource) const
const auto modelId = resource->item(RAttrModelId)->toString();
const auto manufacturer = resource->item(RAttrManufacturerName)->toString();
+ const auto manufacturerConstant = stringToConstant(manufacturer);
- const auto i = std::find_if(d->descriptions.begin(), d->descriptions.end(), [&modelId, &manufacturer](const DeviceDescription &ddf)
+ const auto i = std::find_if(d->descriptions.begin(), d->descriptions.end(), [&modelId, &manufacturer, &manufacturerConstant](const DeviceDescription &ddf)
{
- return ddf.modelIds.contains(modelId) && ddf.manufacturerNames.contains(manufacturer);
+ return (ddf.modelIds.contains(modelId) && (ddf.manufacturerNames.contains(manufacturer) || ddf.manufacturerNames.contains(manufacturerConstant)));
});
if (i != d->descriptions.end())
