summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY3
-rw-r--r--channels.c10
3 files changed, 9 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 93db6e33..fff0b542 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2543,6 +2543,7 @@ Derek Kelly (user.vdr@gmail.com)
for updating sources.conf
for reporting a problem where the frame rate was not detected correctly
for testing the implementation of FE_CAN_TURBO_FEC
+ for reporting unjustified log entries about changed channel pids
Marcel Unbehaun <frostworks@gmx.de>
for adding cRecordingInfo::GetEvent()
diff --git a/HISTORY b/HISTORY
index 404f398c..7b07ac15 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6481,7 +6481,7 @@ Video Disk Recorder Revision History
from Osama Alrawab). See INSTALL for information on how to turn this on.
- Added Arabian language texts (thanks to Osama Alrawab).
-2010-11-01: Version 1.7.17
+2010-11-07: Version 1.7.17
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Fixed following symbolic links in RemoveFileOrDir() (cont'd) (thanks to
@@ -6502,3 +6502,4 @@ Video Disk Recorder Revision History
You should also change the line "F 25" to "F 50" in the 'info' file of that recording.
- Added support for "registration descriptor" to 'libsi' and using it in pat.c (thanks
to Rolf Ahrenberg).
+- Fixed unjustified log entries about changed channel pids (reported by Derek Kelly).
diff --git a/channels.c b/channels.c
index ebc7eb19..c689850b 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: channels.c 2.16 2010/06/05 13:33:57 kls Exp $
+ * $Id: channels.c 2.17 2010/11/07 12:24:59 kls Exp $
*/
#include "channels.h"
@@ -262,12 +262,14 @@ static int IntArraysDiffer(const int *a, const int *b, const char na[][MAXLANGCO
{
int result = 0;
for (int i = 0; a[i] || b[i]; i++) {
- if (a[i] && na && nb && strcmp(na[i], nb[i]) != 0)
+ if (!a[i] || !b[i]) {
+ result |= VALDIFF;
+ break;
+ }
+ if (na && nb && strcmp(na[i], nb[i]) != 0)
result |= STRDIFF;
if (a[i] != b[i])
result |= VALDIFF;
- if (!a[i] || !b[i])
- break;
}
return result;
}