From 9c1bc3096594de84b6847d3edcfcda3462457d8a Mon Sep 17 00:00:00 2001 From: trav90 Date: Tue, 11 Apr 2017 00:14:40 -0500 Subject: [PATCH] Suppress DispatchOnAudioSinkComplete() --- dom/media/AudioSink.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dom/media/AudioSink.cpp b/dom/media/AudioSink.cpp index 19305695f4..d370046737 100644 --- a/dom/media/AudioSink.cpp +++ b/dom/media/AudioSink.cpp @@ -257,7 +257,10 @@ AudioSink::Cleanup() AssertCurrentThreadInMonitor(); nsRefPtr audioStream; audioStream.swap(mAudioStream); - mStateMachine->DispatchOnAudioSinkComplete(); + // Suppress the callback when the stop is requested by MediaDecoderStateMachine. + if (!mStopAudioThread) { + mStateMachine->DispatchOnAudioSinkComplete(); + } ReentrantMonitorAutoExit exit(GetReentrantMonitor()); audioStream->Shutdown();