From 0b481b18e285b057d5d5005b2adebf53a91c5b7f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 17 Feb 2008 16:04:52 +0100
Subject: [PATCH] Fixed setting the current subtitle track in Transfer-Mode

---
 CONTRIBUTORS | 3 +++
 HISTORY      | 6 ++++++
 config.h     | 6 +++---
 device.c     | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 580331b4..32f65b1d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1163,6 +1163,8 @@ Reinhard Nissl <rnissl@gmx.de>
  to be displayed late in live mode
  for a patch that was used to implement handling of DVB-S2
  for reporting an invalid access in the section handler when ending VDR
+ for pointing out that cDevice::Transferring() doesn't return the right value in the
+ early stage of channel switching
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -2207,6 +2209,7 @@ Peter Pinnau <vdr@unterbrecher.de>
 Petri Helin <phelin@googlemail.com>
  for suggesting to avoid budget DVB cards with Common Interface when tuning to an
  FTA channel
+ for reporting a bug in setting the current subtitle track in Transfer-Mode
 
 Oktay Yolgeçen <oktay_73@yahoo.de>
  for translating OSD texts to the Turkish language
diff --git a/HISTORY b/HISTORY
index 8e2abc86..337b11cf 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5643,3 +5643,9 @@ Video Disk Recorder Revision History
 - Introduced 'operator const void * ()' in cString to catch cases where operator*()
   should be used.
 - Fixed calculating the scrollbar sizes in the skins.
+
+2008-02-17: Version 1.5.16
+
+- Fixed setting the current subtitle track in Transfer-Mode (reported by Petri Helin,
+  thanks to Reinhard Nissl for pointing out that cDevice::Transferring() doesn't
+  return the right value in the early stage of channel switching).
diff --git a/config.h b/config.h
index 3a25b7b1..d0fdf38c 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.305 2008/02/05 15:35:11 kls Exp $
+ * $Id: config.h 1.306 2008/02/17 16:04:52 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,8 +22,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.15"
-#define VDRVERSNUM   10515  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.16"
+#define VDRVERSNUM   10516  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/device.c b/device.c
index aaa02540..10f6ec0d 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.153 2008/02/16 13:52:11 kls Exp $
+ * $Id: device.c 1.154 2008/02/17 15:55:06 kls Exp $
  */
 
 #include "device.h"
@@ -1159,7 +1159,7 @@ bool cDevice::Replaying(void) const
 
 bool cDevice::Transferring(void) const
 {
-  return dynamic_cast<cTransfer *>(player) != NULL;
+  return ActualDevice() != PrimaryDevice();
 }
 
 bool cDevice::AttachPlayer(cPlayer *Player)