Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-21 18:52:36 +01:00
Code Issues Projects Releases Wiki Activity

Undo commit db527e4985

Browse Source
This commit is contained in:
Nikolaj Olsson 2024-09-05 21:25:46 +02:00
parent 8ef56bb9bc
commit 4519d017e4
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ui/Forms/Main.cs
View File

@ -13225,17 +13225,8 @@ namespace Nikse.SubtitleEdit.Forms
}
else
{
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 = (currentParagraph.Text.Trim() + Environment.NewLine +
RemoveAssStartAlignmentTag(nextParagraph.Text).Trim()).Trim();
}
currentParagraph.Text = FixAssaTagsAfterMerge(currentParagraph.Text);