Merge pull request #13867 from FernetMenta/threads

make sure not to delete a CThread object while spawn thread is in pro…

1 files changed, 4 insertions, 2 deletions

diff --git a/xbmc/threads/Thread.cpp b/xbmc/threads/Thread.cpp
index 45f3ece553..4295aef196 100644
--- a/xbmc/threads/Thread.cpp
+++ b/xbmc/threads/Thread.cpp
@@ -40,7 +40,7 @@ static thread_local CThread* currentThread;
 //////////////////////////////////////////////////////////////////////
 
 CThread::CThread(const char* ThreadName)
-: m_StopEvent(true,true), m_TermEvent(true), m_StartEvent(true)
+: m_StopEvent(true,true), m_TermEvent(true), m_StartEvent(true, true)
 {
   m_bStop = false;
 
@@ -57,7 +57,7 @@ CThread::CThread(const char* ThreadName)
 }
 
 CThread::CThread(IRunnable* pRunnable, const char* ThreadName)
-: m_StopEvent(true,true), m_TermEvent(true), m_StartEvent(true)
+: m_StopEvent(true, true), m_TermEvent(true), m_StartEvent(true, true)
 {
   m_bStop = false;
 
@@ -155,6 +155,8 @@ bool CThread::IsAutoDelete() const
 
 void CThread::StopThread(bool bWait /*= true*/)
 {
+  m_StartEvent.Wait();
+
   m_bStop = true;
   m_StopEvent.Set();
   CSingleLock lock(m_CriticalSection);