From 7fa7e9c64b3bc010a5d21bf4cb38415aa4f8d6c5 Mon Sep 17 00:00:00 2001
From: niksedk <nikse.dk@gmail.com>
Date: Sat, 25 Sep 2021 13:27:24 +0200
Subject: [PATCH] Fix ASSA new line bug from recent commit

---
 src/libse/SubtitleFormats/AdvancedSubStationAlpha.cs | 2 +-
 src/ui/Forms/Main.cs                                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libse/SubtitleFormats/AdvancedSubStationAlpha.cs b/src/libse/SubtitleFormats/AdvancedSubStationAlpha.cs
index 69bdf1b05..6a1a96007 100644
--- a/src/libse/SubtitleFormats/AdvancedSubStationAlpha.cs
+++ b/src/libse/SubtitleFormats/AdvancedSubStationAlpha.cs
@@ -890,7 +890,7 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text"
 
         public static string FormatText(Paragraph p)
         {
-            string text = NormalizeNewLines(p.Text);
+            string text = p.Text.Replace(Environment.NewLine, "\\N");
 
             if (!text.Contains('<'))
             {
diff --git a/src/ui/Forms/Main.cs b/src/ui/Forms/Main.cs
index 7088b9163..d4d6f2255 100644
--- a/src/ui/Forms/Main.cs
+++ b/src/ui/Forms/Main.cs
@@ -10966,8 +10966,9 @@ namespace Nikse.SubtitleEdit.Forms
                 return;
             }
 
-            var pre = string.Empty;
             var startIdx = currentParagraph.Text.LastIndexOf("<i>", StringComparison.OrdinalIgnoreCase);
+
+            string pre;
             if (startIdx >= 0 &&
                 !currentParagraph.Text.Contains("</i>", StringComparison.OrdinalIgnoreCase) &&
                 nextParagraph.Text.Contains("</i>", StringComparison.OrdinalIgnoreCase))