citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #4367 from wwylele/cubeb-fix 

cubeb_sink: ignore null-name device when selecting
This commit is contained in:
Weiyi Wang 2018-10-26 10:18:47 -04:00 committed by GitHub
parent fa0e82b812 b4062abc11
commit 902f7b51ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/audio_core/cubeb_sink.cpp
View File

@ -56,7 +56,8 @@ CubebSink::CubebSink(std::string target_device_name) : impl(std::make_unique<Imp
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;