Ticket #10759: bdmountfix.patch

File bdmountfix.patch, 1.1 KB (added by bryan@…, 12 years ago)

Fix for the issue and small cleanup of the offending function

  • mythtv/libs/libmythbase/mythcdrom.cpp

    diff --git a/mythtv/libs/libmythbase/mythcdrom.cpp b/mythtv/libs/libmythbase/mythcdrom.cpp
    index b2785cc..cf709ba 100644
    a b void MythCDROM::onDeviceMounted() 
    7878        m_MediaType = MEDIATYPE_DVD;
    7979        m_Status = MEDIASTAT_USEABLE;
    8080    }
    81     if (bd.exists())
     81    else if (bd.exists())
    8282    {
    8383        LOG(VB_MEDIA, LOG_INFO, "Probable Blu-ray detected.");
    8484        m_MediaType = MEDIATYPE_BD;
    void MythCDROM::onDeviceMounted() 
    9797        m_Status = MEDIASTAT_USEABLE;
    9898    }
    9999    else if (bad_dvd.exists())
     100    {
    100101        LOG(VB_GENERAL, LOG_ERR,
    101102            "DVD incorrectly mounted? (ISO9660 instead of UDF)");
     103    }
    102104    else
    103105    {
    104106        LOG(VB_GENERAL, LOG_ERR,
    void MythCDROM::onDeviceMounted() 
    118120    if (m_AllowEject)
    119121    {
    120122        unlock();
    121         if (m_MediaType == MEDIATYPE_DVD || m_MediaType == MEDIATYPE_VCD ||
    122             m_MediaType == MEDIATYPE_BD)
     123        if (m_MediaType == MEDIATYPE_DVD || m_MediaType == MEDIATYPE_VCD)
    123124            unmount();
    124125    }
    125126}