From 8167bf982d232933d629cf19a89e11e2c99258bf Mon Sep 17 00:00:00 2001
From: Joseph Tam <josephnhtam@gmail.com>
Date: Mon, 16 Sep 2024 01:36:15 +0800
Subject: [PATCH] feat: improve client

---
 .../Internal/Client.cs                         | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/LiveStreamingServerNet.Networking/Internal/Client.cs b/src/LiveStreamingServerNet.Networking/Internal/Client.cs
index 841f11ef..fc1cf5d6 100644
--- a/src/LiveStreamingServerNet.Networking/Internal/Client.cs
+++ b/src/LiveStreamingServerNet.Networking/Internal/Client.cs
@@ -77,16 +77,18 @@ public async Task RunAsync(CancellationToken stoppingToken)
             {
                 _logger.ClientLoopError(ClientId, ex);
             }
+            finally
+            {
+                linkedCts.Cancel();
 
-            linkedCts.Cancel();
-
-            await DisposeAsync(handler);
-            await DisposeAsync(_bufferSender);
-            await DisposeAsync(networkStream);
-            CloseTcpClient();
+                await DisposeAsync(handler);
+                await DisposeAsync(_bufferSender);
+                await DisposeAsync(networkStream);
+                CloseTcpClient();
 
-            _stoppedTcs.TrySetResult();
-            _logger.ClientDisconnected(ClientId);
+                _stoppedTcs.TrySetResult();
+                _logger.ClientDisconnected(ClientId);
+            }
         }
 
         private IClientHandler CreateClientHandler()