Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 03:02:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1913 from ivandrofly/develop

Browse Source 
[Compare] - Cache empty paragraph.
This commit is contained in:
Nikolaj Olsson 2016-08-21 19:46:11 +02:00 committed by GitHub
commit ed34262aa4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Forms/Compare.cs
View File

@ -276,6 +276,7 @@ namespace Nikse.SubtitleEdit.Forms
p2 = sub2.GetParagraphOrDefault(index);
int totalWords = 0;
int wordsChanged = 0;
string emptyParagraphToString = new Paragraph().ToString();
if (checkBoxOnlyListDifferencesInText.Checked)
{
while (index < sub1.Paragraphs.Count || index < sub2.Paragraphs.Count)
@ -286,12 +287,12 @@ namespace Nikse.SubtitleEdit.Forms
if (FixWhitespace(p1.ToString()) == FixWhitespace(p2.ToString()) && p1.Number == p2.Number)
{ // no differences
}
else if (p1.ToString() == new Paragraph().ToString())
else if (p1.ToString() == emptyParagraphToString)
{
_differences.Add(index);
subtitleListView1.ColorOut(index, Color.Salmon);
}
else if (p2.ToString() == new Paragraph().ToString())
else if (p2.ToString() == emptyParagraphToString)
{
_differences.Add(index);
subtitleListView2.ColorOut(index, Color.Salmon);
@ -328,11 +329,11 @@ namespace Nikse.SubtitleEdit.Forms
if (FixWhitespace(p1.ToString()) == FixWhitespace(p2.ToString()) && p1.Number == p2.Number)
{ // no differences
}
else if (p1.ToString() == new Paragraph().ToString())
else if (p1.ToString() == emptyParagraphToString)
{
subtitleListView1.ColorOut(index, Color.Salmon);
}
else if (p2.ToString() == new Paragraph().ToString())
else if (p2.ToString() == emptyParagraphToString)
{
subtitleListView2.ColorOut(index, Color.Salmon);
}