Ticket #13326: 20181004_1214_DVD_deadlock_bug.patch

File 20181004_1214_DVD_deadlock_bug.patch, 598 bytes (added by Peter Bennett, 7 years ago)

Work-around for deadlock by commenting a QMutexLocker. This looks safe but it may cause problems. If anybody has a better suggestion please let me know.

  • mythtv/libs/libmythtv/decoderbase.cpp

    diff --git a/mythtv/libs/libmythtv/decoderbase.cpp b/mythtv/libs/libmythtv/decoderbase.cpp
    index d31cfd5289d..7a145d73906 100644
    a b int DecoderBase::SetTrack(uint type, int trackNo)  
    988988
    989989StreamInfo DecoderBase::GetTrackInfo(uint type, uint trackNo) const
    990990{
    991     QMutexLocker locker(avcodeclock);
     991    // This locker causes a deadlock with DVDRingBuffer
     992    // which is waiting while holding the lock.
     993    // QMutexLocker locker(avcodeclock);
    992994
    993995    if (trackNo >= tracks[type].size())
    994996    {