Skip to content

Commit

Permalink
Fix deletes on Slave backends. Remove references to deleted_set and
Browse files Browse the repository at this point in the history
initialise dont_expire_set properly which conflicted with 'deleted'
recgroup behaviour since 0.25. Fixes #10704

Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
  • Loading branch information
iandall authored and stuartm committed Nov 29, 2012
1 parent 3d13d79 commit e150a19
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
4 changes: 1 addition & 3 deletions mythtv/programs/mythbackend/autoexpire.cpp
Expand Up @@ -645,8 +645,6 @@ void AutoExpire::SendDeleteMessages(pginfolist_t &deleteList)
.arg((*it)->GetRecordingStartTime(MythDate::ISODate)));
gCoreContext->dispatch(me);

deleted_set.insert((*it)->MakeUniqueKey());

++it; // move on to next program
}
}
Expand Down Expand Up @@ -1104,7 +1102,7 @@ void AutoExpire::Update(int encoder, int fsID, bool immediately)

void AutoExpire::UpdateDontExpireSet(void)
{
dont_expire_set = deleted_set;
dont_expire_set.clear();

MSqlQuery query(MSqlQuery::InitCon());
query.prepare(
Expand Down
1 change: 0 additions & 1 deletion mythtv/programs/mythbackend/autoexpire.h
Expand Up @@ -113,7 +113,6 @@ class AutoExpire : public QObject

// main expire info
QSet<QString> dont_expire_set;
QSet<QString> deleted_set;
ExpireThread *expire_thread; // protected by instance_lock
uint desired_freq; // protected by instance_lock
bool expire_thread_run; // protected by instance_lock
Expand Down

0 comments on commit e150a19

Please sign in to comment.