Minor fix for import text (if user don't allow two lines)

This commit is contained in:
Nikolaj Olsson 2016-06-12 08:18:19 +02:00
parent 837f91a666
commit f33b2c02ca

View File

@ -222,7 +222,7 @@ namespace Nikse.SubtitleEdit.Forms
{
Paragraph next = _subtitle.GetParagraphOrDefault(i + 1);
bool merge = !(p.Text.Contains(Environment.NewLine) || next == null);
bool merge = !(p.Text.Contains(Environment.NewLine) || next == null) && Configuration.Settings.Tools.ListViewSyntaxMoreThanXLinesX > 1;
if (merge && (p.Text.TrimEnd().EndsWith('!') || p.Text.TrimEnd().EndsWith('.')))
{