From 90f2b83fc0d0bc779879bf8a9f34b442b69cbfd1 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 11 Sep 2018 11:31:00 +0200 Subject: [PATCH] iPerlCommunicationForm : Fixed closing the form when editing check boxes. --- TBF/BenchControl/Sequences/MainSeq.cs | 4 ++++ .../TestMethods/iPerlCommunication/iPerlCommunicationForm.cs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/TBF/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs index 6e5535424..446b5c339 100644 --- a/TBF/BenchControl/Sequences/MainSeq.cs +++ b/TBF/BenchControl/Sequences/MainSeq.cs @@ -1435,6 +1435,10 @@ namespace TBF.BenchControl.Sequences Compound = compound, HeatMeter = heatMeters, +#if ORACLE_DB + WMTypeId = 0, /// <--------------------------- TODO + WMTypeRev = 0, +#endif }; } diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index c41b40781..35e417e38 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -1965,7 +1965,10 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication private void iPerlCommunicationForm_FormClosing(object sender, FormClosingEventArgs e) { - e.Cancel = true; + if ((e.CloseReason == CloseReason.UserClosing) && !checkBoxesEditMode) + { + e.Cancel = true; + } } } }