When joining lines, use the maximum of the lines' end times rather than the last line's end time

Originally committed to SVN as r6734.
This commit is contained in:
Thomas Goyne 2012-05-01 02:49:53 +00:00
parent 9e3553c199
commit 4231653146

View file

@ -242,7 +242,7 @@ static void combine_lines(agi::Context *c, void (*combiner)(AssDialogue *, AssDi
combiner(first, diag);
first->End = diag->End;
first->End = std::max(first->End, diag->End);
delete diag;
}