forked from mia/Aegisub
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:
parent
9e3553c199
commit
4231653146
1 changed files with 1 additions and 1 deletions
|
@ -242,7 +242,7 @@ static void combine_lines(agi::Context *c, void (*combiner)(AssDialogue *, AssDi
|
||||||
|
|
||||||
combiner(first, diag);
|
combiner(first, diag);
|
||||||
|
|
||||||
first->End = diag->End;
|
first->End = std::max(first->End, diag->End);
|
||||||
delete diag;
|
delete diag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue