Ticket #11739: mutex.160127.patch

File mutex.160127.patch, 1.1 KB (added by deadletterfile@…, 3 years ago)

tv_rec.<h cpp> patch adding "return NULL" and single mutex locker

  • tv_rec.cpp

    diff -Naur libmythtvclone/tv_rec.cpp libmythtv/tv_rec.cpp
    old new  
    12531253/// \brief Event handling method, contains event loop.
    12541254void TVRec::run(void)
    12551255{
     1256    QMutexLocker mylocker(&myLock);
    12561257    QMutexLocker lock(&stateChangeLock);
    12571258    SetFlags(kFlagRunMainLoop);
    12581259    ClearFlags(kFlagExitPlayer | kFlagFinishRecording);
     
    39333934
    39343935        ClearFlags(kFlagNeedToStartRecorder);
    39353936        newRecStatus = rsFailed;
    3936 
     3937        return NULL;
    39373938        if (scanner && HasFlags(kFlagEITScannerRunning))
    39383939        {
    39393940            scanner->StopActiveScan();
  • tv_rec.h

    diff -Naur libmythtvclone/tv_rec.h libmythtv/tv_rec.h
    old new  
    362362    // State variables
    363363    mutable QMutex setChannelLock;
    364364    mutable QMutex stateChangeLock;
     365    mutable QMutex myLock;
    365366    mutable QMutex pendingRecLock;
    366367    TVState        internalState;
    367368    TVState        desiredNextState;