Explorar o código

Merge pull request #1596 from FearlessTobi/port-4367

Port citra-emu/citra#4367: "cubeb_sink: ignore null-name device when selecting"
bunnei %!s(int64=7) %!d(string=hai) anos
pai
achega
a9dc34ea5c
Modificáronse 1 ficheiros con 2 adicións e 1 borrados
  1. 2 1
      src/audio_core/cubeb_sink.cpp

+ 2 - 1
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;