From 23f2217e765e14ad2c2a4192d8c57839d657ac6b Mon Sep 17 00:00:00 2001 From: Holger Steinhaus Date: Thu, 12 Nov 2015 11:05:05 +0100 Subject: do not try any CAM steal voodoo if not at least one CAM is present. This change resolves the nasty "retrying" message generated by VDR's cDevice::SwitchChannel() --- device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'device.c') diff --git a/device.c b/device.c index 92405dc..e47014c 100644 --- a/device.c +++ b/device.c @@ -538,10 +538,11 @@ bool cMcliDevice::SetChannelDevice (const cChannel * Channel, bool LiveView) } else { m_disabletimeout = TEMP_DISABLE_TIMEOUT_DEFAULT; } - bool cam_force=true; + bool cam_force = m_mcli && m_mcli->CAMPresent() && LiveView; if(cam_force && !CheckCAM(Channel, true)) { #ifdef DEBUG_TUNE dsyslog("Mcli::%s: No CAM on DVB %d available even after tried to steal one\n", __FUNCTION__, CardIndex () + 1); + dsyslog("CAMPresent: %d\n", m_mcli->CAMPresent()); #endif return false; } -- cgit v1.2.3