4 changes: 2 additions & 2 deletions mythtv/programs/mythbackend/scheduler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3103,7 +3103,7 @@ void Scheduler::HandleIdleShutdown(
return;

// If there are active jobs, then we're not idle
bool activeJobs = JobQueue::HasRunningOrPendingJobs(0);
bool activeJobs = JobQueue::HasRunningOrPendingJobs(0min);

if (!blocking && !recording && !activeJobs && !delay)
{
Expand Down Expand Up @@ -5613,7 +5613,7 @@ void Scheduler::SchedLiveTV(void)
// Get the program that will be recording on this channel at
// record start time and assume this LiveTV session continues
// for at least another 30 minutes from now.
auto *dummy = new RecordingInfo(in.m_chanId, m_livetvTime, true, 4);
auto *dummy = new RecordingInfo(in.m_chanId, m_livetvTime, true, 4h);
dummy->SetRecordingStartTime(m_schedTime);
if (m_schedTime.secsTo(dummy->GetRecordingEndTime()) < 1800)
dummy->SetRecordingEndTime(m_schedTime.addSecs(1800));
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythbackend/services/dvr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,7 @@ DTC::RecRule* Dvr::GetRecordSchedule( uint nRecordId,
// Despite the use of RecordingInfo, this only applies to programs in the
// present or future, not to recordings? Confused yet?
RecordingInfo::LoadStatus status = RecordingInfo::kNoProgram;
RecordingInfo info(nChanId, dStartTime, false, 0, &status);
RecordingInfo info(nChanId, dStartTime, false, 0h, &status);
if (status != RecordingInfo::kFoundProgram)
throw QString("Program does not exist.");
RecordingRule *pRule = info.GetRecordingRule();
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythshutdown/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ static int getStatus(bool bWantRecStatus)
res |= 16;
}

if (JobQueue::HasRunningOrPendingJobs(15))
if (JobQueue::HasRunningOrPendingJobs(15min))
{
LOG(VB_STDIO|VB_FLUSH, LOG_ERR,
QObject::tr("Has queued or pending jobs", "mythshutdown") + "\n");
Expand Down