Merge pull request xbmc#15204 from Memphiz/scriptobs_race

[PluginDirectory] - ensure that Abort of ScriptObserver waits for thread exit - fix crash&burn
MartijnKaijser · Jan 22, 2019 · 23223c4 · 23223c4
2 parents 6b13614 + 0921308
commit 23223c4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/xbmc/filesystem/PluginDirectory.cpp b/xbmc/filesystem/PluginDirectory.cpp
@@ -59,7 +59,8 @@ void CPluginDirectory::CScriptObserver::Process()
 
 void CPluginDirectory::CScriptObserver::Abort()
 {
-  m_bStop = true;
+  // will wait until thread exits
+  StopThread();
 }
 
 CPluginDirectory::CPluginDirectory()