From dfd8e879d1a9583de63ca187f252f82524631252 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 3 Jun 2019 10:07:20 +0200 Subject: [PATCH] Bug fix : 'Save results' was inactive when all test were done, but at least one WM position was disabled, ver. 2.18.1240 --- Results/BatchResults.cs | 4 ++-- Results/Properties/AssemblyInfo.cs | 4 ++-- TBF/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Results/BatchResults.cs b/Results/BatchResults.cs index 4cc7c4c78..7cd18c272 100644 --- a/Results/BatchResults.cs +++ b/Results/BatchResults.cs @@ -164,11 +164,11 @@ namespace Results { for (int i = 0; i < WMPositionsCount; i++) { - if (WaterMeters[i] != null) + if ((WaterMeters[i] != null) && !WaterMeters[i].Disabled) { foreach (var mtr in WaterMeters[i].MeterTestRslts) { - if (!mtr.TestDone) return false; + if (!mtr.TestDone) return false; } } } diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 076a6f25f..e361dc96e 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.18.1227.0")] -[assembly: AssemblyFileVersion("2.18.1227.0")] +[assembly: AssemblyVersion("2.18.1240.0")] +[assembly: AssemblyFileVersion("2.18.1240.0")] diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index af18005dd..b7d8e9032 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1235.0")] -[assembly: AssemblyFileVersion("2.18.1235.0")] +[assembly: AssemblyVersion("2.18.1240.0")] +[assembly: AssemblyFileVersion("2.18.1240.0")]