2 files changed, 4 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 40451bd1..296ebd3d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5526,3 +5526,4 @@ Video Disk Recorder Revision History
 - Updated the Russian OSD texts (thanks to Oleg Roitburd).
 - Fixed handling small PES packets that caused subtitles to be displayed late
   in live mode (based on a patch from Reinhard Nissl).
+- Fixed stopping live subtitles when a player is attached to the device.
diff --git a/device.c b/device.c
index b8e5a8f5..84473af0 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.147 2007/11/03 13:30:09 kls Exp $
+ * $Id: device.c 1.148 2007/11/17 15:39:28 kls Exp $
  */
 
 #include "device.h"
@@ -1148,6 +1148,8 @@ bool cDevice::AttachPlayer(cPlayer *Player)
   if (CanReplay()) {
      if (player)
         Detach(player);
+     DELETENULL(liveSubtitle);
+     DELETENULL(dvbSubtitleConverter);
      pesAssembler->Reset();
      player = Player;
      if (!Transferring())