[client & server] Close waiter: only signal connection closed if the internal channel still exists

1 files changed, 9 insertions, 6 deletions

diff --git a/src/server.rs b/src/server.rs
index 7b94eac..5d3a50a 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -751,12 +751,15 @@ async fn client_connection_task(
         tokio::spawn(async move {
             let conn_err = conn.closed().await;
             info!("Client {} connection closed: {}", client_id, conn_err);
-            to_sync_server
-                .send(ServerAsyncMessage::ClientConnectionClosed(
-                    client_id, conn_err,
-                ))
-                .await
-                .expect("Failed to signal connection lost to sync server");
+            // If we requested the connection to close, channel may have been closed already.
+            if !to_sync_server.is_closed() {
+                to_sync_server
+                    .send(ServerAsyncMessage::ClientConnectionClosed(
+                        client_id, conn_err,
+                    ))
+                    .await
+                    .expect("Failed to signal connection lost to sync server");
+            }
         });
     };