From 25cc41854e82d76864894f343c2dd8f2dfdb35c5 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 23 Feb 2008 15:41:14 +0100 Subject: [PATCH] No longer trying to switch to an available channel if the primary device has no valid programme and a menu is open --- HISTORY | 3 +++ vdr.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index 0f9a6fa0..71d01c8d 100644 --- a/HISTORY +++ b/HISTORY @@ -5663,3 +5663,6 @@ Video Disk Recorder Revision History - The CAM menu now stays open as long as it is automatically updated, even without pressing a remote control key. This is important when updating the CAM firmware from the transponder. +- No longer trying to switch to an available channel if the primary device has + no valid programme and a menu is open (avoids interference with the CAM in + case a CAM menu is open). diff --git a/vdr.c b/vdr.c index ffe1ff36..af690ea7 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.311 2008/02/23 13:19:10 kls Exp $ + * $Id: vdr.c 1.312 2008/02/23 15:36:01 kls Exp $ */ #include @@ -730,7 +730,7 @@ int main(int argc, char *argv[]) // Make sure we have a visible programme in case device usage has changed: if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) { static time_t lastTime = 0; - if (Now - lastTime > MINCHANNELWAIT) { + if (!Menu && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel()); if (Channel && (Channel->Vpid() || Channel->Apid(0))) { if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...