Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 14:32:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix for overlap in "adjust durations" - thx JD :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-06-15 19:37:11 +02:00
parent c78dda9571
commit d8546b1033
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libse/Subtitle.cs
View File

@ -319,12 +319,6 @@ namespace Nikse.SubtitleEdit.Core
}
var newEndTimeInMs = p.EndTime.TotalMilliseconds + ms;
// handle overlap with next
if (newEndTimeInMs > nextStartTimeInMs)
{
newEndTimeInMs = nextStartTimeInMs - Configuration.Settings.General.MinimumMillisecondsBetweenLines;
}
// fix too short duration
var minDur = Math.Max(Configuration.Settings.General.SubtitleMinimumDisplayMilliseconds, 100);
if (p.StartTime.TotalMilliseconds + minDur > newEndTimeInMs)
@ -332,6 +326,12 @@ namespace Nikse.SubtitleEdit.Core
newEndTimeInMs = p.StartTime.TotalMilliseconds + minDur;
}
// handle overlap with next
if (newEndTimeInMs > nextStartTimeInMs + Configuration.Settings.General.MinimumMillisecondsBetweenLines)
{
newEndTimeInMs = nextStartTimeInMs - Configuration.Settings.General.MinimumMillisecondsBetweenLines;
}
if (ms > 0 && newEndTimeInMs < p.EndTime.TotalMilliseconds || ms < 0 && newEndTimeInMs > p.EndTime.TotalMilliseconds)
{
return; // do not adjust wrong way