diff --git a/TBF/LocalSettings.cs b/TBF/LocalSettings.cs index 8bc40952f..ac45b27f5 100644 --- a/TBF/LocalSettings.cs +++ b/TBF/LocalSettings.cs @@ -124,7 +124,7 @@ namespace TBF [XmlArrayAttribute("MetersColumnWidths")] public int[] MetersColumnWidths; [XmlIgnore] - public int MetersColumnCount { get { return (ProcMetersColWidths != null) ? ProcMetersColWidths.Length : 0; } } + public int MetersColumnCount { get { return (MetersColumnWidths != null) ? MetersColumnWidths.Length : 0; } } [XmlArrayAttribute("HeatMetersColumnWidths")] public int[] HeatMetersColumnWidths; diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 82365b70e..08dd3c503 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("3.3.1928.0")] -[assembly: AssemblyFileVersion("3.3.1928.0")] +[assembly: AssemblyVersion("3.3.1934.0")] +[assembly: AssemblyFileVersion("3.3.1934.0")] diff --git a/TBF/UI/Bench/Paths/PathsMetersCtrl.cs b/TBF/UI/Bench/Paths/PathsMetersCtrl.cs index 268e116f2..45c3b88a6 100644 --- a/TBF/UI/Bench/Paths/PathsMetersCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsMetersCtrl.cs @@ -41,9 +41,17 @@ namespace TBF.UI.Bench.Paths this.parentControl = parentControl; /// Load the paths - MyItems = parent.Session.QueryOver() - .OrderBy(x => x.ItemNr).Asc - .List(); + try + { + MyItems = parent.Session.QueryOver() + .OrderBy(x => x.ItemNr).Asc + .List(); + } + catch (Exception exc) + { + log.ErrorFormat("QueryOver() failed ... {0}", exc.Message); + MyItems = new List(); + } foreach (var path in MyItems) path.OriName = path.Name;