mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-11-21 18:52:36 +01:00
Only auto-br if total "merge length" exceeds max line length - thx Llorx :)
Try to fix #8741
This commit is contained in:
parent
7b810fa98a
commit
db527e4985
@ -13218,8 +13218,17 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
else
|
||||
{
|
||||
currentParagraph.Text = (currentParagraph.Text.Trim() + Environment.NewLine +
|
||||
RemoveAssStartAlignmentTag(nextParagraph.Text).Trim()).Trim();
|
||||
var text = (currentParagraph.Text.Trim() + Environment.NewLine +
|
||||
RemoveAssStartAlignmentTag(nextParagraph.Text).Trim()).Trim();
|
||||
var oneLine = Utilities.UnbreakLine(text);
|
||||
if (oneLine.Length <= Configuration.Settings.General.SubtitleLineMaximumLength)
|
||||
{
|
||||
currentParagraph.Text = oneLine;
|
||||
}
|
||||
else
|
||||
{
|
||||
currentParagraph.Text = text;
|
||||
}
|
||||
}
|
||||
|
||||
currentParagraph.Text = FixAssaTagsAfterMerge(currentParagraph.Text);
|
||||
|
Loading…
Reference in New Issue
Block a user