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

Fix "Snap start to next SC" not affecting original

Browse Source
This commit is contained in:
OmrSi 2020-09-29 01:51:00 +03:00
parent 3a3828c9f8
commit f378b1a2d5
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Forms/Main.cs
View File

@ -15169,27 +15169,6 @@ namespace Nikse.SubtitleEdit.Forms
{ {
double nearestSceneChange = nextSceneChanges.Aggregate((x, y) => Math.Abs(x - p.StartTime.TotalSeconds) < Math.Abs(y - p.StartTime.TotalSeconds) ? x : y); double nearestSceneChange = nextSceneChanges.Aggregate((x, y) => Math.Abs(x - p.StartTime.TotalSeconds) < Math.Abs(y - p.StartTime.TotalSeconds) ? x : y);
if (!historyAdded)
{
MakeHistoryForUndo(string.Format(_language.BeforeX, Configuration.Settings.Language.Settings.AdjustSnapStartToNextSceneChange));
historyAdded = true;
}
if (!withGap)
{
if (nearestSceneChange * 1000 < p.EndTime.TotalMilliseconds)
{
p.StartTime.TotalMilliseconds = nearestSceneChange * 1000;
}
}
else
{
if (nearestSceneChange * 1000 + Configuration.Settings.General.MinimumMillisecondsBetweenLines < p.EndTime.TotalMilliseconds)
{
p.StartTime.TotalMilliseconds = nearestSceneChange * 1000 + Configuration.Settings.General.MinimumMillisecondsBetweenLines;
}
}
if (_subtitleAlternate != null && Configuration.Settings.General.AllowEditOfOriginalSubtitle) if (_subtitleAlternate != null && Configuration.Settings.General.AllowEditOfOriginalSubtitle)
{ {
var original = Utilities.GetOriginalParagraph(idx, p, _subtitleAlternate.Paragraphs); var original = Utilities.GetOriginalParagraph(idx, p, _subtitleAlternate.Paragraphs);
@ -15218,6 +15197,27 @@ namespace Nikse.SubtitleEdit.Forms
} }
} }
} }
if (!historyAdded)
{
MakeHistoryForUndo(string.Format(_language.BeforeX, Configuration.Settings.Language.Settings.AdjustSnapStartToNextSceneChange));
historyAdded = true;
}
if (!withGap)
{
if (nearestSceneChange * 1000 < p.EndTime.TotalMilliseconds)
{
p.StartTime.TotalMilliseconds = nearestSceneChange * 1000;
}
}
else
{
if (nearestSceneChange * 1000 + Configuration.Settings.General.MinimumMillisecondsBetweenLines < p.EndTime.TotalMilliseconds)
{
p.StartTime.TotalMilliseconds = nearestSceneChange * 1000 + Configuration.Settings.General.MinimumMillisecondsBetweenLines;
}
}
} }
RefreshSelectedParagraphs(); RefreshSelectedParagraphs();