summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2008-01-27 14:40:11 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2008-01-27 14:40:11 +0100
commit6a4852710b7ea4e0d261ff3c4a79f23cf0a9613d (patch)
treebfc08c335875a4db5de55f3186357f7c3a706ebe /vdr.c
parentd0af2f90e75ba5b87542ff3ad0a6fb7b960d1e97 (diff)
downloadvdr-6a4852710b7ea4e0d261ff3c4a79f23cf0a9613d.tar.gz
vdr-6a4852710b7ea4e0d261ff3c4a79f23cf0a9613d.tar.bz2
Removed switching to the next higher or lower channel if the current channel is not available1.5.14
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/vdr.c b/vdr.c
index 03bc1428..2ad39733 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.306 2008/01/19 12:25:54 kls Exp $
+ * $Id: vdr.c 1.307 2008/01/27 14:38:45 kls Exp $
*/
#include <getopt.h>
@@ -730,9 +730,7 @@ int main(int argc, char *argv[])
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...
- && !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer...
- && !cDevice::SwitchChannel(1) // ...or the next higher available one...
- && !cDevice::SwitchChannel(-1)) // ...or the next lower available one
+ && !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel))) // ...or the one used by the last timer...
;
}
lastTime = Now; // don't do this too often