From 16c67add00ba2b83acc7e5b427104413d952d7ac Mon Sep 17 00:00:00 2001 From: hbeham Date: Sun, 25 May 2014 16:15:24 +0200 Subject: [PATCH] removed unnecessary files from project priorize hex channel names over text channel names --- .../ChanSort.Loader.GlobalClone.csproj | 19 ------------------- ChanSort.Loader.GlobalClone/GcSerializer.cs | 4 +++- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/ChanSort.Loader.GlobalClone/ChanSort.Loader.GlobalClone.csproj b/ChanSort.Loader.GlobalClone/ChanSort.Loader.GlobalClone.csproj index 137c332..ddc3d54 100644 --- a/ChanSort.Loader.GlobalClone/ChanSort.Loader.GlobalClone.csproj +++ b/ChanSort.Loader.GlobalClone/ChanSort.Loader.GlobalClone.csproj @@ -70,25 +70,6 @@ - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - diff --git a/ChanSort.Loader.GlobalClone/GcSerializer.cs b/ChanSort.Loader.GlobalClone/GcSerializer.cs index b53fe50..98fd5fd 100644 --- a/ChanSort.Loader.GlobalClone/GcSerializer.cs +++ b/ChanSort.Loader.GlobalClone/GcSerializer.cs @@ -112,7 +112,9 @@ namespace ChanSort.Loader.GlobalClone ch.OldProgramNr = int.Parse(info.InnerText) & 0x3FFF; break; case "vchName": - ch.Name = ParseName(info.InnerText); + var name = ParseName(info.InnerText); + if (string.IsNullOrWhiteSpace(ch.Name) || !string.IsNullOrWhiteSpace(name)) // avoid overwriting valid name from with empty + ch.Name = name; break; case "sourceIndex": var source = int.Parse(info.InnerText);