Avoiding restarts due to 'panic level' when switching channels on the primary device during EPG scan

This commit is contained in:
Klaus Schmidinger 2002-09-29 13:57:10 +02:00
parent 3b89a2a97e
commit 2c8aa42043
2 changed files with 5 additions and 3 deletions

View File

@ -1533,3 +1533,5 @@ Video Disk Recorder Revision History
key to skip the definition of keys that are not available on your particular
RC unit.
- Fixed handling DVD subtitles in the SPU decoder (thanks to Andreas Schultz).
- Avoiding restarts due to 'panic level' when switching channels on the primary
device during EPG scan.

View File

@ -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;
}