Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Unified Diff: media/audio/audio_output_controller.cc

Issue 11785002: Fix regression with audio mirroring due to observers being added while iterating over the list of ob (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_controller.cc
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index a9dd2c855c340ade8a95443a54418013f88cc6fd..b195fa633f915b47ec8a675ff6d8287033e7295a 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -141,7 +141,8 @@ void AudioOutputController::DoCreate() {
// Everything started okay, so register for state change callbacks if we have
// not already done so.
- audio_manager_->AddOutputDeviceChangeListener(this);
+ if (state_ != kRecreating)
miu 2013/01/04 21:57:56 This will leave us in a state where AOC is not reg
justinlin 2013/01/04 22:31:02 Right. Hmm, I saw a DCHECK failure due to this (ob
+ audio_manager_->AddOutputDeviceChangeListener(this);
// We have successfully opened the stream. Set the initial volume.
stream_->SetVolume(volume_);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698