diff --git a/ChanSort.Loader.Toshiba/DbSerializer.cs b/ChanSort.Loader.Toshiba/DbSerializer.cs index db5f2ac..0015bae 100644 --- a/ChanSort.Loader.Toshiba/DbSerializer.cs +++ b/ChanSort.Loader.Toshiba/DbSerializer.cs @@ -193,9 +193,10 @@ namespace ChanSort.Loader.Toshiba while (r.Read()) { int satId = r.IsDBNull(0) ? 0 : r.GetInt32(0); - string format = satId != 0 ? "S{0}-{1}-{2}-{3}" : "C-{1}-{2}-{3}"; - string uid = string.Format(format, this.DataRoot.Satellites.TryGet(satId).OrbitalPosition, - r.GetInt32(1), r.GetInt32(2), r.GetInt32(3)); + var sat = this.DataRoot.Satellites.TryGet(satId); + var satPos = sat != null ? sat.OrbitalPosition : "0.0"; + string format = sat != null ? "S{0}-{1}-{2}-{3}" : "C-{1}-{2}-{3}"; + string uid = string.Format(format, satPos, r.GetInt32(1), r.GetInt32(2), r.GetInt32(3)); this.channelInfoByUid[uid] = r.GetInt32(4) != 0; } } diff --git a/ChanSort/MainForm.cs b/ChanSort/MainForm.cs index 615bd8e..8e2724f 100644 --- a/ChanSort/MainForm.cs +++ b/ChanSort/MainForm.cs @@ -25,7 +25,7 @@ namespace ChanSort.Ui { public partial class MainForm : XtraForm { - public const string AppVersion = "v2014-06-08.2"; + public const string AppVersion = "v2014-06-08.3"; private const int MaxMruEntries = 10; diff --git a/readme.txt b/readme.txt index cfd1d9f..e5726cd 100644 --- a/readme.txt +++ b/readme.txt @@ -1,7 +1,7 @@ -Version v2014-06-08.2 ===================================================== +Version v2014-06-08.3 ===================================================== Changes: -- added support for LG xxLB580V analog and DVB-C/T channel lists +- fixed problem with Toshiba lists that refer to invalid satellites The complete change log can be found at the end of this document @@ -115,6 +115,9 @@ OTHER DEALINGS IN THE SOFTWARE. Change log ================================================================ +2014-06-08.3 +- fixed problem with Toshiba lists that refer to invalid satellites + 2014-06-08.2 - added support for LG xxLB580V analog and DVB-C/T channel lists