summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY5
-rw-r--r--config.h4
-rw-r--r--dvbdevice.c4
4 files changed, 10 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f988ff49..605efd1c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -643,6 +643,7 @@ Torsten Herz <torsten.herz@web.de>
for reporting a wrong EPG bugfix code number for the MAX_USEFUL_SUBTITLE_LENGTH fix
for fixing a bug in resetting OSD color palettes
for adding missing 'const' to some cChannel member functions
+ for fixing handling Priority -1 in cDvbDevice::ProvidesChannel()
Steffen Becker <stbecker@rbg.informatik.tu-darmstadt.de>
for reporting a problem with CPU load peaks (in the EPG scanner)
diff --git a/HISTORY b/HISTORY
index 51e7d133..c7fbca03 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2459,3 +2459,8 @@ Video Disk Recorder Revision History
- Added North American satellites to 'sources.conf' (thanks to Luke Jenkins).
- Fixed getting the list of recordings in case VDR is started from a directory
where it doesn't have access to (thanks to Dirk Mueller).
+
+2003-11-09: Version 1.2.6pre6
+
+- Fixed handling Priority -1 in cDvbDevice::ProvidesChannel() (thanks to
+ Torsten Herz).
diff --git a/config.h b/config.h
index 73fe653c..1f055b12 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 1.176.1.4 2003/11/07 15:31:00 kls Exp $
+ * $Id: config.h 1.176.1.5 2003/11/09 11:06:10 kls Exp $
*/
#ifndef __CONFIG_H
@@ -19,7 +19,7 @@
#include "device.h"
#include "tools.h"
-#define VDRVERSION "1.2.6pre5"
+#define VDRVERSION "1.2.6pre6"
#define VDRVERSNUM 10206 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 4e7b50ca..5ae8c6fd 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.c 1.67.1.3 2003/11/07 13:24:49 kls Exp $
+ * $Id: dvbdevice.c 1.67.1.4 2003/11/09 11:08:22 kls Exp $
*/
#include "dvbdevice.h"
@@ -654,7 +654,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
result = hasPriority;
- if (Receiving()) {
+ if (Priority >= 0 && Receiving()) {
if (dvbTuner->IsTunedTo(Channel)) {
if (!HasPid(Channel->Vpid())) {
#ifdef DO_MULTIPLE_RECORDINGS