From 9d01d565dfea7fe754231d429144fc71532d9a21 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 24 May 2021 16:26:56 +0200 Subject: [PATCH] DataEntry.Standard6 bug fix, ver. 3.1.1656 --- TBF/Properties/AssemblyInfo.cs | 4 ++-- TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 6cbbf4dc2..793680bc5 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.1.1655.0")] -[assembly: AssemblyFileVersion("3.1.1655.0")] +[assembly: AssemblyVersion("3.1.1656.0")] +[assembly: AssemblyFileVersion("3.1.1656.0")] diff --git a/TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs index 6c2d6806a..c616a9696 100644 --- a/TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs +++ b/TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs @@ -46,7 +46,7 @@ namespace TBF.Rig.DataEntry.Standard6 checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6 }; remarkBoxes = new ComboBox[] { remarkComboBox1, remarkComboBox2, remarkComboBox3, remarkComboBox4, remarkComboBox5, remarkComboBox6 }; - this.WaterMetersCount = waterMetersCount; + this.WaterMetersCount = Math.Min(waterMetersCount, comboBoxes.Length); this.RemarksEnabled = remarksEnabled; SNText = new string[WaterMetersCount]; @@ -128,12 +128,7 @@ namespace TBF.Rig.DataEntry.Standard6 private void okButton_Click(object sender, EventArgs e) { PurchaseOrder = orderComboBox.Text; - Program.LocalSettings.UpdateHistory(orderComboBox.Text, - ref Program.LocalSettings.PurchaseOrderHistory -#if FUZHOU_150 || FUZHOU_300 - , 20 -#endif - ); + Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory); Program.LocalSettings.LastSNTexts = SNText;