diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-12-20 12:18:19 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-12-20 12:18:19 +0100 |
| commit | 16c07b98245e94a162685803acd4ba4b5d4298a3 (patch) | |
| tree | e44802522d3c141ccc98e52a80016b862f60cf55 /lib/dvb/tstools.cpp | |
| parent | 0fff842a5f2b4185257aadb6b6a3dfa033a91d72 (diff) | |
| parent | 0cbccde1b0264df7a0a5f8723b8de881f0d5f927 (diff) | |
| download | enigma2-16c07b98245e94a162685803acd4ba4b5d4298a3.tar.gz enigma2-16c07b98245e94a162685803acd4ba4b5d4298a3.zip | |
Merge branch 'master' into obi/master
Conflicts:
main/Makefile.am
Diffstat (limited to 'lib/dvb/tstools.cpp')
| -rw-r--r-- | lib/dvb/tstools.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp index cfea3fdd..1403059f 100644 --- a/lib/dvb/tstools.cpp +++ b/lib/dvb/tstools.cpp @@ -40,7 +40,7 @@ int eDVBTSTools::openFile(const char *filename, int nostreaminfo) if (f->open(filename, 1) < 0) return -1; - setSource(src, filename); + setSource(src, nostreaminfo ? NULL : filename); return 0; } |