Fix displaying external text subtitles under a rare situation.

If external subs are enabled by default and the first video frame has a zero timestamp, TextSubtitles gets confused about the start and end time of the last displayed sub.
MythTV · Dec 15, 2010 · e139b29 · e139b29
1 parent 87db118
commit e139b29
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/mythtv/libs/libmythtv/subtitlescreen.cpp b/mythtv/libs/libmythtv/subtitlescreen.cpp
@@ -361,6 +361,12 @@ void SubtitleScreen::DisplayTextSubtitles(void)
 
     DeleteAllChildren();
     SetRedraw();
+    if (playPos == 0)
+    {
+        subs->Unlock();
+        return;
+    }
+
     QStringList rawsubs = subs->GetSubtitles(playPos);
     if (rawsubs.empty())
     {

diff --git a/mythtv/libs/libmythtv/textsubtitleparser.h b/mythtv/libs/libmythtv/textsubtitleparser.h
@@ -40,7 +40,11 @@ typedef vector<text_subtitle_t> TextSubtitleList;
 class TextSubtitles
 {
   public:
-    TextSubtitles() : m_frameBasedTiming(false) {}
+    TextSubtitles() : m_frameBasedTiming(false)
+    {
+        m_lastReturnedSubtitle.start = 0;
+        m_lastReturnedSubtitle.end   = 0;
+    }
 
     virtual ~TextSubtitles() {}