summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWeiyi Wang <wwylele@gmail.com>2018-10-26 00:32:41 -0400
committerfearlessTobi <thm.frey@gmail.com>2018-10-27 00:43:04 +0200
commit12c365b54959207ec1ae186b8110fcc15e561267 (patch)
tree513fc86cbcbc26ec4337e472237cb3b036781637 /src
parentd278f25bda79a2d2ed560a68f3983881c1a1e501 (diff)
cubeb_sink: ignore null-name device when selecting
We already ignore them on listing devices. We should do the same when selecting devices. This fix a crash when opening a specific device while there is a null device in the list
Diffstat (limited to 'src')
-rw-r--r--src/audio_core/cubeb_sink.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/audio_core/cubeb_sink.cpp b/src/audio_core/cubeb_sink.cpp
index 392039688..d31a1c844 100644
--- a/src/audio_core/cubeb_sink.cpp
+++ b/src/audio_core/cubeb_sink.cpp
@@ -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;