From 4db7778ef99760ddbe7f694741e46b5cdd1f06cc Mon Sep 17 00:00:00 2001
From: Nikolaj Olsson <nikse.dk@gmail.com>
Date: Sat, 23 Apr 2016 11:34:55 +0200
Subject: [PATCH] Minor change for 890

---
 .gitignore                         | 2 ++
 libse/SubtitleFormats/Cavena890.cs | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index bd09543d1..2e8cee5b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/libse/SubtitleFormats/Cavena890.cs b/libse/SubtitleFormats/Cavena890.cs
index 50e48b702..6530866e4 100644
--- a/libse/SubtitleFormats/Cavena890.cs
+++ b/libse/SubtitleFormats/Cavena890.cs
@@ -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
                 {