Sort return from subtitles_during to fix all-subtitles display in SubtitlePanel.

1 files changed, 9 insertions, 0 deletions

diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index 6028d10a9..d1992f138 100644
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -143,6 +143,13 @@ FFmpegSubtitleStream::text_subtitles_during (ContentTimePeriod period, bool star
 	return subtitles_during (period, starting, _text_subtitles);
 }
 
+struct PeriodSorter
+{
+	bool operator() (ContentTimePeriod const & a, ContentTimePeriod const & b) {
+		return a.from < b.from;
+	}
+};
+
 list<ContentTimePeriod>
 FFmpegSubtitleStream::subtitles_during (ContentTimePeriod period, bool starting, PeriodMap const & subs) const
 {
@@ -155,6 +162,8 @@ FFmpegSubtitleStream::subtitles_during (ContentTimePeriod period, bool starting,
 		}
 	}
 
+	d.sort (PeriodSorter ());
+
 	return d;
 }