From 4578915ea8542a550bea78ceadcd173eca333595 Mon Sep 17 00:00:00 2001
From: Jared Goodwin <jared.goodwin@immy.bot>
Date: Thu, 27 Apr 2023 14:27:47 -0700
Subject: [PATCH] Fix WPF RelayCommand binding issue.

---
 Agent/Services/ChatClientService.cs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/Agent/Services/ChatClientService.cs b/Agent/Services/ChatClientService.cs
index fbcbb9d6..fc00d9af 100644
--- a/Agent/Services/ChatClientService.cs
+++ b/Agent/Services/ChatClientService.cs
@@ -31,9 +31,20 @@ namespace Remotely.Agent.Services
             SlidingExpiration = TimeSpan.FromMinutes(10),
             RemovedCallback = new CacheEntryRemovedCallback(args =>
             {
-                var chatSession = (args.CacheItem.Value as ChatSession);
-                chatSession.PipeStream.Dispose();
-                Process.GetProcessById(chatSession.ProcessID)?.Kill();
+                try
+                {
+                    if (args.CacheItem.Value is not ChatSession chatSession)
+                    {
+                        return;
+                    }
+                    chatSession.PipeStream.Dispose();
+                    var chatProcess = Process.GetProcessById(chatSession.ProcessID);
+                    if (chatProcess?.HasExited == false)
+                    {
+                        chatProcess.Kill();
+                    }
+                }
+                catch { }
             })
         };