From 182becb8db96634b7a2d5910066cb840e8f4dc92 Mon Sep 17 00:00:00 2001 From: Waldi Ravens Date: Fri, 18 Sep 2015 22:36:22 +0200 Subject: [PATCH] Work-around for issue #1285 --- src/Forms/Main.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 61163813f..259fb09e1 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -329,8 +329,15 @@ namespace Nikse.SubtitleEdit.Forms comboBoxEncoding.Items.Add(Encoding.UTF8.EncodingName); foreach (var ei in Encoding.GetEncodings()) { - if (ei.Name != Encoding.UTF8.BodyName && ei.CodePage >= 949 && !ei.DisplayName.Contains("EBCDIC") && ei.CodePage != 1047) //Configuration.Settings.General.EncodingMinimumCodePage) - comboBoxEncoding.Items.Add(ei.CodePage + ": " + ei.DisplayName); + try + { + if (ei.Name != Encoding.UTF8.BodyName && ei.CodePage >= 949 && !ei.DisplayName.Contains("EBCDIC") && ei.CodePage != 1047) //Configuration.Settings.General.EncodingMinimumCodePage) + comboBoxEncoding.Items.Add(ei.CodePage + ": " + ei.DisplayName); + } + catch + { + // Work-around for issue #1285 + } } SetEncoding(Configuration.Settings.General.DefaultEncoding);