diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2008-02-23 15:41:14 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2008-02-23 15:41:14 +0100 |
| commit | 25cc41854e82d76864894f343c2dd8f2dfdb35c5 (patch) | |
| tree | 0543a7be880f573015c3f54190a556a47a9dd280 /vdr.c | |
| parent | 300d402663e3378d3710b40e29c79a1cc4f4c262 (diff) | |
| download | vdr-25cc41854e82d76864894f343c2dd8f2dfdb35c5.tar.gz vdr-25cc41854e82d76864894f343c2dd8f2dfdb35c5.tar.bz2 | |
No longer trying to switch to an available channel if the primary device has no valid programme and a menu is open
Diffstat (limited to 'vdr.c')
| -rw-r--r-- | vdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 <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... |