Fixed a bug regarding "Fix overlapping display times" not being applied - thx menes :)

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1058 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2012-03-18 17:47:17 +00:00
parent 48975402c7
commit c788495913

View File

@ -541,7 +541,7 @@ namespace Nikse.SubtitleEdit.Forms
{
if (prevWantedDisplayTime <= (p.StartTime.TotalMilliseconds - prev.StartTime.TotalMilliseconds))
{
if (AllowFix(p, fixAction))
if (AllowFix(target, fixAction))
{
prev.EndTime.TotalMilliseconds = p.StartTime.TotalMilliseconds - 1;
if (canBeEqual)
@ -579,7 +579,7 @@ namespace Nikse.SubtitleEdit.Forms
}
else if (Math.Abs(p.StartTime.TotalMilliseconds - prev.StartTime.TotalMilliseconds) < 10 && Math.Abs(p.EndTime.TotalMilliseconds - prev.EndTime.TotalMilliseconds) < 10)
{ // merge lines with same time codes
if (AllowFix(p, fixAction))
if (AllowFix(target, fixAction))
{
prev.Text = prev.Text.Replace(Environment.NewLine, " ");
p.Text = p.Text.Replace(Environment.NewLine, " ");