diff options
| author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2008-04-28 18:29:49 +0200 |
|---|---|---|
| committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2008-04-28 18:29:49 +0200 |
| commit | 6181d7c55428697e7a55e2b4c535a0f7165077ab (patch) | |
| tree | 9730e6ed1623048789c217ab64a65e71b2f32dc3 /searchtimer_thread.c | |
| parent | 11dbe2c560259f37f0f477426996a472b41d26be (diff) | |
| download | vdr-plugin-epgsearch-6181d7c55428697e7a55e2b4c535a0f7165077ab.tar.gz vdr-plugin-epgsearch-6181d7c55428697e7a55e2b4c535a0f7165077ab.tar.bz2 | |
ignore 'no annoucement while replaying' when update was forced, 0.9.24.rc2
Diffstat (limited to 'searchtimer_thread.c')
| -rw-r--r-- | searchtimer_thread.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/searchtimer_thread.c b/searchtimer_thread.c index 7f7a273..4461595 100644 --- a/searchtimer_thread.c +++ b/searchtimer_thread.c @@ -382,7 +382,7 @@ void cSearchTimerThread::Action(void) { if (t || // timer already exists or NoAnnounces.InList(pEvent) || // announcement not wanted anymore or - (EPGSearchConfig.noAnnounceWhileReplay && cDevice::PrimaryDevice()->Replaying()) // no announce while replay + (EPGSearchConfig.noAnnounceWhileReplay && cDevice::PrimaryDevice()->Replaying() && updateForced != 2) // no announce while replay within automatic updates ) { if (Summary) free(Summary); @@ -493,7 +493,8 @@ void cSearchTimerThread::Action(void) *DateTime(conflictCheck.nextRelevantConflictDate)); bool doMessage = EPGSearchConfig.noConflMsgWhileReplay == 0 || !cDevice::PrimaryDevice()->Replaying() || - conflictCheck.nextRelevantConflictDate - now < 2*60*60; + conflictCheck.nextRelevantConflictDate - now < 2*60*60 || + updateForced == 2; if (doMessage && SendMsg(msgfmt, true,7) == kOk) { m_plugin->showConflicts = true; |