mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-29 22:20:33 +00:00
Check if threads are joinable before joining (issue with boost 1.52)
This commit is contained in:
parent
85ec80100c
commit
596c9b80a9
@ -989,9 +989,12 @@ void VideoState::deinit()
|
||||
this->audioq.cond.notify_one();
|
||||
this->videoq.cond.notify_one();
|
||||
|
||||
this->parse_thread.join();
|
||||
this->video_thread.join();
|
||||
this->refresh_thread.join();
|
||||
if (this->parse_thread.joinable())
|
||||
this->parse_thread.join();
|
||||
if (this->video_thread.joinable())
|
||||
this->video_thread.join();
|
||||
if (this->refresh_thread.joinable())
|
||||
this->refresh_thread.join();
|
||||
|
||||
if(this->audio_st)
|
||||
avcodec_close((*this->audio_st)->codec);
|
||||
|
Loading…
x
Reference in New Issue
Block a user