Fix. Close active document or form close action with hi Cancel button…

… leads to stop recording spectra.
Am6er · Mar 1, 2024 · 4091d11 · 4091d11
1 parent 6735436
commit 4091d11
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/BecquerelMonitor/BecquerelMonitor.csproj b/BecquerelMonitor/BecquerelMonitor.csproj
@@ -35,8 +35,8 @@
     <MinimumRequiredVersion>2022.07.08.7</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>index.html</WebPage>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>2024.03.1.1</ApplicationVersion>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>2024.03.1.2</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/BecquerelMonitor/MainForm.cs b/BecquerelMonitor/MainForm.cs
@@ -244,7 +244,7 @@ void InitializeToolViews()
         // Token: 0x06000A4A RID: 2634 RVA: 0x0003CB48 File Offset: 0x0003AD48
         void MainForm_FormClosing(object sender, FormClosingEventArgs e)
         {
-            if (!this.initialized)
+            if (!this.initialized || e.Cancel)
             {
                 return;
             }
@@ -1279,14 +1279,14 @@ void CloseActiveDocument()
         {
             if (this.activeDocument != null)
             {
-                this.StopRecordingOrTesting(this.activeDocument);
-                this.DestroyVCPThreads(this.activeDocument);
-                this.DestroyRCThreads(this.activeDocument);
                 if (this.ConfirmSaveDocument(this.activeDocument))
                 {
                     this.UnsubscribeDocumentEvent(this.activeDocument);
                     this.documentManager.CloseDocument(this.activeDocument);
                 }
+                this.StopRecordingOrTesting(this.activeDocument);
+                this.DestroyVCPThreads(this.activeDocument);
+                this.DestroyRCThreads(this.activeDocument);
             }
 
             GC.Collect();
@@ -1673,14 +1673,14 @@ void DocEnergySpectrum_FormClosing(object sender, FormClosingEventArgs e)
                 return;
             }
             DocEnergySpectrum docEnergySpectrum = (DocEnergySpectrum)sender;
-            this.StopRecordingOrTesting(docEnergySpectrum);
-            this.DestroyVCPThreads(docEnergySpectrum);
-            this.DestroyRCThreads(docEnergySpectrum);
             if (!this.ConfirmSaveDocument(docEnergySpectrum))
             {
                 e.Cancel = true;
                 return;
             }
+            this.StopRecordingOrTesting(docEnergySpectrum);
+            this.DestroyVCPThreads(docEnergySpectrum);
+            this.DestroyRCThreads(docEnergySpectrum);
             docEnergySpectrum.FormClosing -= this.DocEnergySpectrum_FormClosing;
         }
 

diff --git a/BecquerelMonitor/Properties/AssemblyInfo.cs b/BecquerelMonitor/Properties/AssemblyInfo.cs
@@ -4,13 +4,13 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("2024.03.1.1")]
+[assembly: AssemblyVersion("2024.03.1.2")]
 [assembly: AssemblyProduct("BecquerelMonitor")]
 [assembly: AssemblyCopyright("free")]
 [assembly: AssemblyTrademark("none")]
 [assembly: AssemblyConfiguration("")]
 [assembly: Guid("40110b38-4882-47c1-ad94-a71e58dcb5f8")]
-[assembly: AssemblyFileVersion("2024.03.1.1")]
+[assembly: AssemblyFileVersion("2024.03.1.2")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyCompany("free")]
 [assembly: CompilationRelaxations(8)]