diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2002-09-29 13:57:10 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2002-09-29 13:57:10 +0200 |
| commit | 2c8aa42043b35e19600f1181369f1ecb076cf5db (patch) | |
| tree | 38949abbbc9dfb98fa20dac031de442d42063446 /dvbdevice.c | |
| parent | 3b89a2a97e6652fbb613d50b771cbcfd8e396414 (diff) | |
| download | vdr-2c8aa42043b35e19600f1181369f1ecb076cf5db.tar.gz vdr-2c8aa42043b35e19600f1181369f1ecb076cf5db.tar.bz2 | |
Avoiding restarts due to 'panic level' when switching channels on the primary device during EPG scan1.1.11
Diffstat (limited to 'dvbdevice.c')
| -rw-r--r-- | dvbdevice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dvbdevice.c b/dvbdevice.c index e10a376a..f337e357 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.20 2002/09/28 12:21:42 kls Exp $ + * $Id: dvbdevice.c 1.21 2002/09/29 13:53:26 kls Exp $ */ #include "dvbdevice.h" @@ -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; } |