aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfritsch <Peter.Fruehberger@gmail.com>2017-02-22 20:46:22 +0100
committerfritsch <Peter.Fruehberger@gmail.com>2017-02-22 21:59:49 +0100
commit631de5ad2e6388524a038708c18d66f0f1e5fdbb (patch)
tree32753959e71a8c694adbb7832a11ac459be7694a
parent43413756bfde08bd621c09e0bf47ac0485076b9c (diff)
AESinkPULSE: Avoid deadlock
-rw-r--r--xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp
index 50d729bd42..31d003967c 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp
@@ -795,8 +795,11 @@ void CAESinkPULSE::Deinitialize()
if (m_Stream)
Drain();
- if (m_MainLoop)
- pa_threaded_mainloop_stop(m_MainLoop);
+ {
+ CSingleExit exit(m_sec);
+ if (m_MainLoop)
+ pa_threaded_mainloop_stop(m_MainLoop);
+ }
if (m_Stream)
{