From 9ac0d00d174d09341489543b0019129d7b5d3533 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Fri, 21 Jun 2013 07:51:16 +0300 Subject: [PATCH] Fix subtitle generation --- src/core/subtitles.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/subtitles.cpp b/src/core/subtitles.cpp index a284de0d..5643f21c 100644 --- a/src/core/subtitles.cpp +++ b/src/core/subtitles.cpp @@ -140,14 +140,14 @@ namespace for(uint64_t i = 1; i < lastframe; i++) { moviefile_subtiming posmarker(i); auto j = our_movie.subtitles.upper_bound(posmarker); - if(j == our_movie.subtitles.end() || !j->first.inrange(i)) + if(j == our_movie.subtitles.end()) continue; - if(lasttxt != j->second) { + if(lasttxt != j->second || !j->first.inrange(i)) { if(lasttxt != "") y << "{" << since << "}{" << i - 1 << "}" << s_subescape(lasttxt) << std::endl; since = i; - lasttxt = j->second; + lasttxt = j->first.inrange(i) ? j->second : ""; } } if(lasttxt != "") -- 2.11.4.GIT