try fix segfault with --enable-cleanup

This commit is contained in:
Jacek Jendrzej
2017-03-13 19:13:37 +01:00
parent 32a0fb6de4
commit 76530e2c05

View File

@@ -264,8 +264,11 @@ bool CStreamManager::Stop()
if (!running)
return false;
running = false;
cancel();
bool ret = (OpenThreads::Thread::join() == 0);
bool ret = false;
if (OpenThreads::Thread::CurrentThread() == this) {
cancel();
ret = (OpenThreads::Thread::join() == 0);
}
StopAll();
return ret;
}