Merge pull request #1596 from FearlessTobi/port-4367

Port citra-emu/citra#4367: "cubeb_sink: ignore null-name device when selecting"
This commit is contained in:
bunnei 2018-10-27 13:26:24 -04:00 committed by GitHub
commit a9dc34ea5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -121,7 +121,8 @@ CubebSink::CubebSink(std::string target_device_name) {
const auto collection_end{collection.device + collection.count};
const auto device{
std::find_if(collection.device, collection_end, [&](const cubeb_device_info& info) {
return target_device_name == info.friendly_name;
return info.friendly_name != nullptr &&
target_device_name == info.friendly_name;
})};
if (device != collection_end) {
output_device = device->devid;