Skip to content

Commit

Permalink
Fix longstanding issue with Scheduler::getConflicting().
Browse files Browse the repository at this point in the history
Somewhere along the line, probably in a refactoring or cleanup,
getConflicting() was broken by making it use FindNextConflict().  The
problem is that FindNextConflict() strictly checks inputs and when
getConflicting() is called, the inputs for non-recording programs have
already been removed.  This fix adds an ignoreinput parameter to be
used when FindNextConflict() is called from getConflicting().

(cherry picked from commit 93c278d)
  • Loading branch information
gigem committed Oct 12, 2020
1 parent 577dd50 commit eb3c84d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
8 changes: 5 additions & 3 deletions mythtv/programs/mythbackend/scheduler.cpp
Expand Up @@ -1065,7 +1065,8 @@ bool Scheduler::FindNextConflict(
const RecordingInfo *p,
RecConstIter &iter,
OpenEndType openEnd,
uint *paffinity) const
uint *paffinity,
bool ignoreinput) const
{
uint affinity = 0;
for ( ; iter != cardlist.end(); ++iter)
Expand All @@ -1082,7 +1083,7 @@ bool Scheduler::FindNextConflict(
if (debugConflicts)
msg = QString("comparing with '%1' ").arg(q->GetTitle());

if (p->GetInputID() != q->GetInputID())
if (p->GetInputID() != q->GetInputID() && !ignoreinput)
{
const vector <uint> &conflicting_inputs =
m_sinputInfoMap[p->GetInputID()].m_conflictingInputs;
Expand Down Expand Up @@ -1715,7 +1716,8 @@ void Scheduler::getConflicting(RecordingInfo *pginfo, RecList *retlist)
QReadLocker tvlocker(&TVRec::s_inputsLock);

RecConstIter i = m_recList.begin();
for (; FindNextConflict(m_recList, pginfo, i); ++i)
for (; FindNextConflict(m_recList, pginfo, i, openEndNever,
nullptr, true); ++i)
{
const RecordingInfo *p = *i;
retlist->push_back(new RecordingInfo(*p));
Expand Down
3 changes: 2 additions & 1 deletion mythtv/programs/mythbackend/scheduler.h
Expand Up @@ -158,7 +158,8 @@ class Scheduler : public MThread, public MythScheduler
bool FindNextConflict(const RecList &cardlist,
const RecordingInfo *p, RecConstIter &iter,
OpenEndType openEnd = openEndNever,
uint *paffinity = nullptr) const;
uint *paffinity = nullptr,
bool ignoreinput = false) const;
const RecordingInfo *FindConflict(const RecordingInfo *p,
OpenEndType openEnd = openEndNever,
uint *affinity = nullptr,
Expand Down

0 comments on commit eb3c84d

Please sign in to comment.