Fixed setting events to timers in case a non-VPS event has expired

This commit is contained in:
Klaus Schmidinger 2006-02-26 10:25:59 +01:00
parent 450c7ef1af
commit 9488c94133
2 changed files with 4 additions and 3 deletions

View File

@ -4360,7 +4360,7 @@ Video Disk Recorder Revision History
- Added a comment to tChannelID::nid, explaining that is is actually the "original"
network id.
2006-02-25: Version 1.3.44
2006-02-26: Version 1.3.44
- Fixed setting the audio language codes in 'Transfer-Mode' (reported by Rolf
Ahrenberg). The actual problem was the call to the Transferring() function in
@ -4401,3 +4401,4 @@ Video Disk Recorder Revision History
menu when pressing the "Blue" button. In order to avoid unnecessary work, each
timer now has its own timestamp to control whether its schedule has changed
since the last time its event has been set.
- Fixed setting events to timers in case a non-VPS event has expired.

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: timers.c 1.48 2006/02/25 15:57:56 kls Exp $
* $Id: timers.c 1.49 2006/02/26 10:17:38 kls Exp $
*/
#include "timers.h"
@ -467,7 +467,7 @@ void cTimer::SetEventFromSchedule(const cSchedules *Schedules)
Event = e;
}
}
if (Event && Event->EndTime() < now - EXPIRELATENCY && !Event->IsRunning())
if (Event && Event->EndTime() < now - EXPIRELATENCY && Overlap > FULLMATCH && !Event->IsRunning())
Event = NULL;
SetEvent(Event);
}