From d4fbdb70c1da3c5dcb5d6b709d860a01591742e5 Mon Sep 17 00:00:00 2001 From: ivandroly Date: Thu, 23 Jul 2015 17:52:14 +0000 Subject: [PATCH 1/2] Use native lines splitter --- src/Logic/Utilities.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Logic/Utilities.cs b/src/Logic/Utilities.cs index b0cd07ad0..8cfe21a75 100644 --- a/src/Logic/Utilities.cs +++ b/src/Logic/Utilities.cs @@ -3077,7 +3077,7 @@ namespace Nikse.SubtitleEdit.Logic { var subtitle = new Subtitle { Header = matroskaSubtitleInfo.CodecPrivate }; var lines = new List(); - foreach (string l in subtitle.Header.Trim().Replace(Environment.NewLine, "\n").Split('\n')) + foreach (string l in subtitle.Header.Trim().SplitToLines()) lines.Add(l); var footer = new StringBuilder(); var comments = new Subtitle(); From b7533d89cd0abe4051d01bb63b02d6eb36eff005 Mon Sep 17 00:00:00 2001 From: ivandroly Date: Thu, 23 Jul 2015 17:52:51 +0000 Subject: [PATCH 2/2] Remove unnecessary cast --- src/Forms/ShowHistory.Designer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Forms/ShowHistory.Designer.cs b/src/Forms/ShowHistory.Designer.cs index 19c2ead44..25511d1de 100644 --- a/src/Forms/ShowHistory.Designer.cs +++ b/src/Forms/ShowHistory.Designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.listViewHistory = new System.Windows.Forms.ListView(); - this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader1 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader2 = new System.Windows.Forms.ColumnHeader(); this.buttonRollback = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label();