summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-04-28 13:29:22 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2006-04-28 13:29:22 +0200
commit70297ef1741cb9f38decfd39d3e6b4a353bd891c (patch)
tree6963cbfa594acb615fbdbfffd32d883fb87b744f
parenta302fd67af6e77cd5ab8314b356b661b1850190e (diff)
downloadvdr-70297ef1741cb9f38decfd39d3e6b4a353bd891c.tar.gz
vdr-70297ef1741cb9f38decfd39d3e6b4a353bd891c.tar.bz2
Fixed tuning to the channel of a VPS timer if the device is the actual device1.3.49
-rw-r--r--HISTORY1
-rw-r--r--vdr.c6
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;