diff options
Diffstat (limited to 'dvbdevice.c')
| -rw-r--r-- | dvbdevice.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dvbdevice.c b/dvbdevice.c index 0ba7c25..f337e35 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.19 2002/09/15 13:12:25 kls Exp $ + * $Id: dvbdevice.c 1.21 2002/09/29 13:53:26 kls Exp $ */ #include "dvbdevice.h" @@ -344,7 +344,7 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On) return true; } -bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) +bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const { bool result = false; bool hasPriority = Priority < 0 || Priority > this->Priority(); @@ -593,7 +593,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView) } if (!(status & FE_HAS_LOCK)) { esyslog("ERROR: channel %d not locked on DVB card %d!", Channel->number, CardIndex() + 1); - if (IsPrimaryDevice()) + if (LiveView && IsPrimaryDevice()) cThread::RaisePanic(); return false; } @@ -603,7 +603,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView) if (ioctl(fd_frontend, FE_GET_EVENT, &event) >= 0) { if (event.type != FE_COMPLETION_EV) { esyslog("ERROR: channel %d not sync'ed on DVB card %d!", Channel->number, CardIndex() + 1); - if (IsPrimaryDevice()) + if (LiveView && IsPrimaryDevice()) cThread::RaisePanic(); return false; } |