Moved scanning tpid back to where Rolf Ahrenberg's patch originally did it

This commit is contained in:
Klaus Schmidinger 2011-08-26 12:44:21 +02:00
parent d00941c1fd
commit 2d3cb812fb
1 changed files with 3 additions and 3 deletions

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: channels.c 2.18 2011/08/21 14:13:54 kls Exp $ * $Id: channels.c 2.19 2011/08/26 12:44:21 kls Exp $
*/ */
#include "channels.h" #include "channels.h"
@ -656,8 +656,6 @@ bool cChannel::Parse(const char *s)
dpids[NumDpids] = 0; dpids[NumDpids] = 0;
dtypes[NumDpids] = 0; dtypes[NumDpids] = 0;
} }
if (sscanf(tpidbuf, "%d", &tpid) != 1)
return false;
int NumSpids = 0; int NumSpids = 0;
if ((p = strchr(tpidbuf, ';')) != NULL) { if ((p = strchr(tpidbuf, ';')) != NULL) {
*p++ = 0; *p++ = 0;
@ -680,6 +678,8 @@ bool cChannel::Parse(const char *s)
} }
spids[NumSpids] = 0; spids[NumSpids] = 0;
} }
if (sscanf(tpidbuf, "%d", &tpid) != 1)
return false;
if (caidbuf) { if (caidbuf) {
char *p = caidbuf; char *p = caidbuf;
char *q; char *q;