Ticket #4421: fix_livepreview_lockup.patch
File fix_livepreview_lockup.patch, 1.1 KB (added by , 16 years ago) |
---|
-
playbackbox.cpp
520 520 while (previewVideoState != kKilled && previewVideoState != kStopped && 521 521 previewVideoThreadRunning) 522 522 { 523 killPlayer(); 523 524 /* ensure that key events don't mess up our previewVideoStates */ 524 525 previewVideoState = (previewVideoState == kKilled) ? 525 526 kKilled : kKilling; … … 2285 2286 (previewVideoKillTimeout.elapsed() > 2000)) 2286 2287 { 2287 2288 pthread_join(previewVideoThread, NULL); 2288 previewVideoThreadRunning = true;2289 previewVideoThreadRunning = false; 2289 2290 delete previewVideoNVP; 2290 2291 delete previewVideoRingBuf; 2291 2292 … … 4960 4961 4961 4962 recGroupType[query.value(0).toString()] = "recgroup"; 4962 4963 4963 if (dispGroup != "LiveTV" || liveTVInAll) 4964 if ((dispGroup != "LiveTV" || liveTVInAll) && 4965 (dispGroup != "Deleted")) 4964 4966 totalItems += items; 4965 4967 } 4966 4968 }