From f7e5bf4860c3f377d9de5d2757a0a8b1ec04813b Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 13 Sep 2015 16:54:16 -0700 Subject: [PATCH] core: fix cleanup race condition in mixer --- src/core/Mixer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp index f8dc66940..5c85ff2f3 100644 --- a/src/core/Mixer.cpp +++ b/src/core/Mixer.cpp @@ -221,11 +221,10 @@ void Mixer::stopProcessing() if( m_fifoWriter != NULL ) { m_fifoWriter->finish(); - m_audioDev->stopProcessing(); - m_fifoWriter->wait( 1000 ); - m_fifoWriter->terminate(); + m_fifoWriter->wait(); delete m_fifoWriter; m_fifoWriter = NULL; + m_audioDev->stopProcessing(); } else {