TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 18:03:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix double-lock

Browse Source
This commit is contained in:
David Rose 2011-11-18 00:36:31 +00:00
parent d3cdb2e11b
commit f2b5952159
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/movies/ffmpegVideoCursor.cxx
View File

@ -653,7 +653,6 @@ st_thread_main(void *self) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void FfmpegVideoCursor:: void FfmpegVideoCursor::
thread_main() { thread_main() {
MutexHolder holder(_lock);
if (ffmpeg_cat.is_spam()) { if (ffmpeg_cat.is_spam()) {
ffmpeg_cat.spam() ffmpeg_cat.spam()
<< "ffmpeg thread for " << _filename.get_basename() << " starting.\n"; << "ffmpeg thread for " << _filename.get_basename() << " starting.\n";
@ -669,6 +668,7 @@ thread_main() {
// Now repeatedly wait for something interesting to do, until we're told // Now repeatedly wait for something interesting to do, until we're told
// to shut down. // to shut down.
MutexHolder holder(_lock);
while (_thread_status != TS_shutdown) { while (_thread_status != TS_shutdown) {
nassertv(_thread_status != TS_stopped); nassertv(_thread_status != TS_stopped);
_action_cvar.wait(); _action_cvar.wait();