From 86b33e0b7e5a3ff3060182ab63ce04a224a18b21 Mon Sep 17 00:00:00 2001 From: Tim Haloun Date: Mon, 11 Nov 2019 10:31:46 -0800 Subject: [PATCH] Don't ask for the friendly name of a default device if we failed to enumerate it. Bug: b/144233691 Change-Id: I5f80c63858ec851ab14bcc3c1ca51ca2e9507834 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/159582 Reviewed-by: Henrik Andreassson Commit-Queue: Tim Haloun Cr-Commit-Position: refs/heads/master@{#29778} --- modules/audio_device/win/core_audio_utility_win.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/audio_device/win/core_audio_utility_win.cc b/modules/audio_device/win/core_audio_utility_win.cc index bd4f4e812c..0a86266079 100644 --- a/modules/audio_device/win/core_audio_utility_win.cc +++ b/modules/audio_device/win/core_audio_utility_win.cc @@ -476,6 +476,10 @@ bool GetDeviceNamesInternal(EDataFlow data_flow, for (size_t i = 0; i < arraysize(role); ++i) { default_device = CreateDeviceInternal(AudioDeviceName::kDefaultDeviceId, data_flow, role[i]); + if (!default_device.Get()) { + return false; + } + std::string device_name; device_name += (role[i] == eConsole ? "Default - " : "Communication - "); device_name += GetDeviceFriendlyNameInternal(default_device.Get());