summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-29 00:28:37 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-29 00:28:37 +0000
commit27559bc5178b359974c8f59d1de36efabbd7fd0e (patch)
treebe0608c5c9562b60174a6cebb109a4fb66a824a6 /media
parent20fab9ec3cc2f1387247339c6eab504873b3824f (diff)
downloadchromium_src-27559bc5178b359974c8f59d1de36efabbd7fd0e.zip
chromium_src-27559bc5178b359974c8f59d1de36efabbd7fd0e.tar.gz
chromium_src-27559bc5178b359974c8f59d1de36efabbd7fd0e.tar.bz2
Fixes bug where NullAudioRenderer would join a previously joined thread.
TBR=hclam Review URL: http://codereview.chromium.org/100135 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/filters/null_audio_renderer.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/filters/null_audio_renderer.cc b/media/filters/null_audio_renderer.cc
index 74604f8..a6ed798 100644
--- a/media/filters/null_audio_renderer.cc
+++ b/media/filters/null_audio_renderer.cc
@@ -86,8 +86,10 @@ bool NullAudioRenderer::OnInitialize(const MediaFormat& media_format) {
void NullAudioRenderer::OnStop() {
shutdown_ = true;
- if (thread_)
+ if (thread_) {
PlatformThread::Join(thread_);
+ thread_ = NULL;
+ }
}
} // namespace media