From cc42f51d8732a16b5fadc5bfc2a26532496fe860 Mon Sep 17 00:00:00 2001
From: Proudlock <270015376@geaerospace.com>
Date: Tue, 8 Sep 2026 17:58:23 -0400
Subject: [PATCH] Fix crash when clicking acknowledge button on fleet alert

- Stop countdown timer before closing form
- Add FormClosing event handler to ensure cleanup
- Bump tray version to 1.6.1
---
 agent/ShopDbEndpointAgent.Tray/FleetAlertForm.cs          | 8 ++++++++
 .../ShopDbEndpointAgent.Tray.csproj                       | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/agent/ShopDbEndpointAgent.Tray/FleetAlertForm.cs b/agent/ShopDbEndpointAgent.Tray/FleetAlertForm.cs
index 4341a303..d50bfcb5 100644
--- a/agent/ShopDbEndpointAgent.Tray/FleetAlertForm.cs
+++ b/agent/ShopDbEndpointAgent.Tray/FleetAlertForm.cs
@@ -37,6 +37,12 @@ internal sealed class FleetAlertForm : Form
         ApplyRoundedCorners();
 
         Load += FleetAlertForm_Load;
+        FormClosing += FleetAlertForm_FormClosing;
+    }
+
+    private void FleetAlertForm_FormClosing(object? sender, FormClosingEventArgs e)
+    {
+        countdownTimer?.Stop();
     }
 
     private void FleetAlertForm_Load(object? sender, EventArgs e)
@@ -255,6 +261,7 @@ internal sealed class FleetAlertForm : Form
 
     private void AcknowledgeButton_Click(object? sender, EventArgs e)
     {
+        countdownTimer?.Stop();
         OnAcknowledgeClicked?.Invoke(this, EventArgs.Empty);
         DialogResult = DialogResult.OK;
         Close();
@@ -262,6 +269,7 @@ internal sealed class FleetAlertForm : Form
 
     private void CloseButton_Click(object? sender, EventArgs e)
     {
+        countdownTimer?.Stop();
         OnAcknowledgeClicked?.Invoke(this, EventArgs.Empty);
         DialogResult = DialogResult.OK;
         Close();
diff --git a/agent/ShopDbEndpointAgent.Tray/ShopDbEndpointAgent.Tray.csproj b/agent/ShopDbEndpointAgent.Tray/ShopDbEndpointAgent.Tray.csproj
index 65c0d240..9122be2e 100644
--- a/agent/ShopDbEndpointAgent.Tray/ShopDbEndpointAgent.Tray.csproj
+++ b/agent/ShopDbEndpointAgent.Tray/ShopDbEndpointAgent.Tray.csproj
@@ -71,7 +71,9 @@
 			  copies of the exit-code handling. A tray that cannot open the channel
 			  logs and keeps its timer, so the failure mode is "refresh is not
 			  immediate", not "session data stops working". Requires agent 1.11.0. -->
-		 <Version>1.6.0</Version>
+		 <!-- 1.6.1: fix crash when clicking acknowledge button. The countdown timer
+	     is now properly stopped before the form closes to prevent disposal issues. -->
+	<Version>1.6.1</Version>
 	<InvariantGlobalization>true</InvariantGlobalization>
 	<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 	<SelfContained>true</SelfContained>