Ticket #1682: cleanup_subtitles_on_channel_change-proper.diff

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -2178 +2178 @@
         return;
     }
 
-    if (eof)
+    if (eof) {
         discontinuity = true;
+        if (osdHasSubtitles || nonDisplayedSubtitles.size() > 0)
+            ClearSubtitles();
+    }
 
     livetvchain->SetProgram(pginfo);
 
@@ -2252 +2255 @@
     VERBOSE(VB_PLAYBACK, "JumpToProgram(void)");
     bool discontinuity = false, newtype = false;
     ProgramInfo *pginfo = livetvchain->GetSwitchProgram(discontinuity, newtype);
+    if (osdHasSubtitles || nonDisplayedSubtitles.size() > 0)
+        ClearSubtitles();
+
     if (!pginfo)
         return;