summaryrefslogtreecommitdiff
path: root/searchtimer_thread.c
diff options
context:
space:
mode:
Diffstat (limited to 'searchtimer_thread.c')
-rw-r--r--searchtimer_thread.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/searchtimer_thread.c b/searchtimer_thread.c
index 6039c54..2e17d8d 100644
--- a/searchtimer_thread.c
+++ b/searchtimer_thread.c
@@ -147,7 +147,7 @@ const cTimer *cSearchTimerThread::GetTimer(const cTimers* vdrtimers, cSearchExt
continue;
// ignore manual timers if this search could modify them
- if (searchExt->action == searchTimerActionRecord && TriggeredFromSearchTimerID(ti) == -1) // manual timer
+ if ((searchExt->action == searchTimerActionRecord || searchExt->action == searchTimerActionInactiveRecord) && TriggeredFromSearchTimerID(ti) == -1) // manual timer
continue;
if (UseVPS && ti->HasFlags(tfVps))
@@ -728,6 +728,9 @@ bool cSearchTimerThread::AddModTimer(cTimer* Timer, int index, cSearchExt* searc
else
Flags = 1; // don't use VPS, if not set in this search
+ if (searchExt->action == searchTimerActionInactiveRecord)
+ Flags &= ~tfActive;
+
// already done the same timer?
if (!EPGSearchConfig.TimerProgRepeat && index == 0 && TimersDone.InList(start, stop, pEvent, -1))
{