From 70297ef1741cb9f38decfd39d3e6b4a353bd891c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 28 Apr 2006 13:29:22 +0200
Subject: [PATCH] Fixed tuning to the channel of a VPS timer if the device is
 the actual device

---
 HISTORY | 1 +
 vdr.c   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/HISTORY b/HISTORY
index 111089f5..33a7ad8b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4676,3 +4676,4 @@ Video Disk Recorder Revision History
   menu.c to "restart anyway?" (suggested by Rolf Ahrenberg).
 - Removed the obsolete "'1' for encrypted radio channels" part from the description
   of the VPID in vdr.5 (reported by Alexander Hans).
+- Fixed tuning to the channel of a VPS timer if the device is the actual device.
diff --git a/vdr.c b/vdr.c
index 773d704b..79223863 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.265 2006/04/28 12:24:04 kls Exp $
+ * $Id: vdr.c 1.266 2006/04/28 13:23:55 kls Exp $
  */
 
 #include <getopt.h>
@@ -792,9 +792,9 @@ int main(int argc, char *argv[])
                         }
                      // Switch the device to the transponder:
                      if (Device) {
-                        if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
-                           cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
                         if (!Device->IsTunedToTransponder(Timer->Channel())) {
+                           if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
+                              cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
                            dsyslog("switching device %d to channel %d", Device->DeviceNumber() + 1, Timer->Channel()->Number());
                            Device->SwitchChannel(Timer->Channel(), false);
                            DeviceUsed[Device->DeviceNumber()] = Now;