Subtitles: Reset the external subtitle filename. Refs #11618

This ensures that during Live TV, .srt subtitles from the previous program are not accidentally used for the next program.
MythTV · Jul 1, 2013 · 66f80e0 · 66f80e0
1 parent f5e11be
commit 66f80e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/mythtv/libs/libmythtv/fileringbuffer.cpp b/mythtv/libs/libmythtv/fileringbuffer.cpp
@@ -186,6 +186,7 @@ bool FileRingBuffer::OpenFile(const QString &lfilename, uint retry_ms)
 
     filename = lfilename;
     safefilename = lfilename;
+    subtitlefilename.clear();
 
     if (remotefile)
     {

diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -2676,8 +2676,9 @@ void MythPlayer::JumpToProgram(void)
     TVState desiredState = player_ctx->GetState();
     bool isInProgress =
         desiredState == kState_WatchingRecording || kState_WatchingLiveTV;
-    if (!subfn.isEmpty() && GetSubReader())
-        GetSubReader()->LoadExternalSubtitles(subfn, isInProgress);
+    if (GetSubReader())
+        GetSubReader()->LoadExternalSubtitles(subfn, isInProgress &&
+                                              !subfn.isEmpty());
 
     if (!player_ctx->buffer->IsOpen())
     {