diff options
Diffstat (limited to 'vdr.c')
| -rw-r--r-- | vdr.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.310 2008/02/10 14:23:31 kls Exp $ + * $Id: vdr.c 1.312 2008/02/23 15:36:01 kls Exp $ */ #include <getopt.h> @@ -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... @@ -877,7 +877,9 @@ int main(int argc, char *argv[]) } if (cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) { // the previous SwitchChannel() has switched away the current live channel - Channels.SwitchTo(Timer->Channel()->Number()); // avoids toggling between old channel and black screen + cDevice::SetAvoidDevice(Device); + if (!Channels.SwitchTo(cDevice::CurrentChannel())) // try to switch to the original channel on a different device... + Channels.SwitchTo(Timer->Channel()->Number()); // ...or avoid toggling between old channel and black screen Skins.Message(mtInfo, tr("Upcoming recording!")); } } |