Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #2505 from fritsch/ae-fix-segfault-resume

AE: possible segfault after suspend / resume (m_sink might be gone)
  • Loading branch information...
commit a58502e6b05cfe6f7c8e04372035cb5649b55c57 2 parents 93f0634 + c0e5009
@davilla davilla authored
Showing with 2 additions and 1 deletion.
  1. +2 −1  xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
View
3  xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
@@ -1537,7 +1537,8 @@ inline void CSoftAE::ProcessSuspend()
*/
if (!m_isSuspended && (!m_playingStreams.empty() || !m_playing_sounds.empty()))
{
- m_reOpen = !m_sink->SoftResume() || m_reOpen; // sink returns false if it requires reinit (worthless with current implementation)
+ // the sink might still be not initialized after Resume of real suspend
+ m_reOpen = m_sink && (!m_sink->SoftResume() || m_reOpen); // sink returns false if it requires reinit (worthless with current implementation)
m_sinkIsSuspended = false; //sink processing data
m_softSuspend = false; //break suspend loop (under some conditions)
CLog::Log(LOGDEBUG, "Resumed the Sink");
Please sign in to comment.
Something went wrong with that request. Please try again.