mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 10:11:33 +00:00
Code Issues Releases Wiki Activity

Check if threads are joinable before joining (issue with boost 1.52)

Browse source
This commit is contained in:
scrawl 2013-12-27 22:38:30 +01:00
parent 85ec80100c
commit 596c9b80a9
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwrender/videoplayer.cpp
View file

@ -989,9 +989,12 @@ void VideoState::deinit()
this->audioq.cond.notify_one(); this->audioq.cond.notify_one();
this->videoq.cond.notify_one(); this->videoq.cond.notify_one();
this->parse_thread.join(); if (this->parse_thread.joinable())
this->video_thread.join(); this->parse_thread.join();
this->refresh_thread.join(); if (this->video_thread.joinable())
this->video_thread.join();
if (this->refresh_thread.joinable())
this->refresh_thread.join();
if(this->audio_st) if(this->audio_st)
avcodec_close((*this->audio_st)->codec); avcodec_close((*this->audio_st)->codec);