mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 14:32:35 +01:00
Fix for overlap in "adjust durations" - thx JD :)
This commit is contained in:
parent
c78dda9571
commit
d8546b1033
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user