Fixed testing for matching section filters in case they are turned off

This commit is contained in:
Klaus Schmidinger 2004-01-10 10:03:58 +01:00
parent 732387379d
commit 37a73ed5b4
3 changed files with 11 additions and 6 deletions

View File

@ -652,6 +652,7 @@ Marcel Wiesweg <marcel.wiesweg@gmx.de>
currently not transmitting
for fixing volume display in case a plugin has its own OSD open
for providing 'libsi' and adapting the EIT mechanisms to it
for fixing testing for matching section filters in case they are turned off
Torsten Herz <torsten.herz@web.de>
for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu

View File

@ -2538,7 +2538,7 @@ Video Disk Recorder Revision History
overflow that caused a crash when cleaning up the EPG data (at 05:00 in the
morning).
2004-01-09: Version 1.3.1
2004-01-10: Version 1.3.1
- Fixed a lockup in the EPG scanner when no non-primary device was available
(thanks to Martin Holst for reporting this one).
@ -2560,3 +2560,5 @@ Video Disk Recorder Revision History
- Fixed a 'const' in libsi/si.h (thanks to Marcel Wiesweg).
- Fixed the 'su' call in 'runvdr' to make it work on systems that require the
user name to appear before the command option (thanks to Robert Huitl).
- Fixed testing for matching section filters in case they are turned off (thanks
to Marcel Wiesweg).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: filter.c 1.2 2004/01/05 14:30:00 kls Exp $
* $Id: filter.c 1.3 2004/01/10 10:02:06 kls Exp $
*/
#include "filter.h"
@ -120,10 +120,12 @@ void cFilter::SetStatus(bool On)
bool cFilter::Matches(u_short Pid, u_char Tid)
{
for (cFilterData *fd = data.First(); fd; fd = data.Next(fd)) {
if (fd->Matches(Pid, Tid))
return true;
}
if (on) {
for (cFilterData *fd = data.First(); fd; fd = data.Next(fd)) {
if (fd->Matches(Pid, Tid))
return true;
}
}
return false;
}