Ticket #10704: deleted_set.patch

File deleted_set.patch, 1.3 KB (added by Ian Dall <ian@…>, 12 years ago)

Patch to remove references to deleted_set and initialise dont_expire_set properly.

  • mythtv/programs/mythbackend/autoexpire.cpp 

    diff --git a/mythtv/programs/mythbackend/autoexpire.cpp b/mythtv/programs/mythbackend/autoexpire.cpp
index a34d35e..a0b9c50 100644
    a b void AutoExpire::SendDeleteMessages(pginfolist_t &deleteList) 
    644644                     .arg((*it)->GetRecordingStartTime(ISODate)));
    645645        gCoreContext->dispatch(me);
    646646
    647         deleted_set.insert((*it)->MakeUniqueKey());
    648 
    649647        ++it; // move on to next program
    650648    }
    651649}
    … … void AutoExpire::Update(int encoder, int fsID, bool immediately) 
    11051103
    11061104void AutoExpire::UpdateDontExpireSet(void)
    11071105{
    1108     dont_expire_set = deleted_set;
     1106    dont_expire_set.clear();
    11091107
    11101108    MSqlQuery query(MSqlQuery::InitCon());
    11111109    query.prepare(

  • mythtv/programs/mythbackend/autoexpire.h 

    diff --git a/mythtv/programs/mythbackend/autoexpire.h b/mythtv/programs/mythbackend/autoexpire.h
index 8939f38..d47ff86 100644
    a b class AutoExpire : public QObject 
    113113
    114114    // main expire info
    115115    QSet<QString> dont_expire_set;
    116     QSet<QString> deleted_set;
    117116    ExpireThread *expire_thread;     // protected by instance_lock
    118117    uint          desired_freq;      // protected by instance_lock
    119118    bool          expire_thread_run; // protected by instance_lock