Minor change for 890

This commit is contained in:
Nikolaj Olsson 2016-04-23 11:34:55 +02:00
parent 31ecf2dda1
commit 4db7778ef9
2 changed files with 4 additions and 2 deletions

2
.gitignore vendored
View File

@ -30,3 +30,5 @@ SubtitleEdit-*-setup.exe
/src/.nuget/NuGet.Config
/src/packages/
/src/SubtitleEdit.VC.opendb
/src/SubtitleEdit.VC.VC.opendb
/src/SubtitleEdit.VC.db

View File

@ -799,7 +799,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
if (lastNumber == number)
{
p = subtitle.Paragraphs[subtitle.Paragraphs.Count - 1];
string temp = (line1 + Environment.NewLine + line2).Trim();
string temp = (line1.TrimEnd() + Environment.NewLine + line2).TrimEnd();
if (temp.Length > 0)
p.Text = temp;
}
@ -808,7 +808,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
subtitle.Paragraphs.Add(p);
p.StartTime.TotalMilliseconds = (TimeCode.BaseUnit / Configuration.Settings.General.CurrentFrameRate) * startFrame;
p.EndTime.TotalMilliseconds = (TimeCode.BaseUnit / Configuration.Settings.General.CurrentFrameRate) * endFrame;
p.Text = (line1 + Environment.NewLine + line2).Trim();
p.Text = (line1.TrimEnd() + Environment.NewLine + line2).TrimEnd();
}
if (boxType >= 0xa0 && boxType <= 0xa9 && !string.IsNullOrEmpty(p.Text)) // box
{