Ticket #4421: fix_livepreview_lockup.patch

File fix_livepreview_lockup.patch, 1.1 KB (added by Ron Frazier <ron@…>, 12 years ago)
  • playbackbox.cpp

     
    520520    while (previewVideoState != kKilled && previewVideoState != kStopped &&
    521521           previewVideoThreadRunning)
    522522    {
     523        killPlayer();
    523524        /* ensure that key events don't mess up our previewVideoStates */
    524525        previewVideoState = (previewVideoState == kKilled) ?
    525526            kKilled :  kKilling;
     
    22852286            (previewVideoKillTimeout.elapsed() > 2000))
    22862287        {
    22872288            pthread_join(previewVideoThread, NULL);
    2288             previewVideoThreadRunning = true;
     2289            previewVideoThreadRunning = false;
    22892290            delete previewVideoNVP;
    22902291            delete previewVideoRingBuf;
    22912292
     
    49604961
    49614962            recGroupType[query.value(0).toString()] = "recgroup";
    49624963
    4963             if (dispGroup != "LiveTV" || liveTVInAll)
     4964            if ((dispGroup != "LiveTV" || liveTVInAll) &&
     4965                (dispGroup != "Deleted"))
    49644966                totalItems += items;
    49654967        }
    49664968    }