Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 06:22:38 +01:00
Code Issues Projects Releases Wiki Activity

Fix crash in export of compare result - thx billysamk :)

Browse Source 
Fix #3126
This commit is contained in:
Nikolaj Olsson 2018-10-03 22:29:26 +02:00
parent 6ff053af5d
commit 25733fd70a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Forms/Compare.cs
View File

@ -114,8 +114,7 @@ namespace Nikse.SubtitleEdit.Forms
return;
}
_subtitle1 = new Subtitle();
Encoding encoding;
var format = _subtitle1.LoadSubtitle(openFileDialog1.FileName, out encoding, null);
var format = _subtitle1.LoadSubtitle(openFileDialog1.FileName, out _, null);
if (format == null)
{
var pac = new Pac();
@ -196,8 +195,7 @@ namespace Nikse.SubtitleEdit.Forms
return;
}
_subtitle2 = new Subtitle();
Encoding encoding;
var format = _subtitle2.LoadSubtitle(openFileDialog1.FileName, out encoding, null);
var format = _subtitle2.LoadSubtitle(openFileDialog1.FileName, out _, null);
if (format == null)
{
var pac = new Pac();
@ -957,11 +955,11 @@ namespace Nikse.SubtitleEdit.Forms
MessageBox.Show(Configuration.Settings.Language.CompareSubtitles.CannotCompareWithImageBasedSubtitles);
return;
}
Encoding encoding;
if (listView.Name == "subtitleListView1")
{
_subtitle1 = new Subtitle();
_subtitle1.LoadSubtitle(filePath, out encoding, null);
_subtitle1.LoadSubtitle(filePath, out _, null);
subtitleListView1.Fill(_subtitle1);
subtitleListView1.SelectIndexAndEnsureVisible(0);
subtitleListView2.SelectIndexAndEnsureVisible(0);
@ -973,7 +971,7 @@ namespace Nikse.SubtitleEdit.Forms
else
{
_subtitle2 = new Subtitle();
_subtitle2.LoadSubtitle(filePath, out encoding, null);
_subtitle2.LoadSubtitle(filePath, out _, null);
subtitleListView2.Fill(_subtitle2);
subtitleListView1.SelectIndexAndEnsureVisible(0);
subtitleListView2.SelectIndexAndEnsureVisible(0);
@ -1080,8 +1078,7 @@ namespace Nikse.SubtitleEdit.Forms
sb.AppendLine(" </table>");
sb.AppendLine(" </body>");
sb.AppendLine("</html>");
var statistic = string.Format(sb.ToString());
File.WriteAllText(fileName, statistic);
File.WriteAllText(fileName, sb.ToString());
}
}
}