Commit bbca5658 authored by Ken MacKay's avatar Ken MacKay Committed by Commit Bot

[Chromecast] Fix crash when ALSA volume element has no mixer

Bug: internal b/74200001
Change-Id: I44c5cfacd53acea6188f5c9753907d8f2d995763
Reviewed-on: https://chromium-review.googlesource.com/950141Reviewed-by: default avatarLuke Halliwell <halliwell@chromium.org>
Commit-Queue: Kenneth MacKay <kmackay@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541052}
parent a62bb4f1
...@@ -349,11 +349,13 @@ void AlsaVolumeControl::RefreshMixerFds(ScopedAlsaMixer* mixer) { ...@@ -349,11 +349,13 @@ void AlsaVolumeControl::RefreshMixerFds(ScopedAlsaMixer* mixer) {
} }
void AlsaVolumeControl::OnFileCanReadWithoutBlocking(int fd) { void AlsaVolumeControl::OnFileCanReadWithoutBlocking(int fd) {
alsa_->MixerHandleEvents(volume_mixer_->mixer); if (volume_mixer_->mixer) {
if (mute_mixer_) { alsa_->MixerHandleEvents(volume_mixer_->mixer);
}
if (mute_mixer_ && mute_mixer_->mixer) {
alsa_->MixerHandleEvents(mute_mixer_->mixer); alsa_->MixerHandleEvents(mute_mixer_->mixer);
} }
if (amp_mixer_) { if (amp_mixer_ && amp_mixer_->mixer) {
// amixer locks up if we don't call this for unknown reasons. // amixer locks up if we don't call this for unknown reasons.
alsa_->MixerHandleEvents(amp_mixer_->mixer); alsa_->MixerHandleEvents(amp_mixer_->mixer);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment