Fix double controller disconnect messages.

w3champions · Dec 9, 2023 · 58c8171 · 58c8171
1 parent 485e06a
commit 58c8171
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/crates/client/src/controller/stream.rs b/crates/client/src/controller/stream.rs
@@ -152,6 +152,8 @@ impl ControllerStream {
       ))
       .await?;
 
+    let mut disconnect_handled = false;
+
     loop {
       tokio::select! {
         next_send = frame_receiver.recv() => {
@@ -190,6 +192,10 @@ impl ControllerStream {
                   tracing::error!("handle frame: {}", e);
                 }
               }
+
+              if frame.type_id == PacketTypeId::LobbyDisconnect {
+                disconnect_handled = true;
+              }
             },
             Err(e) => {
               tracing::debug!("exiting: recv: {}", e);
@@ -200,15 +206,17 @@ impl ControllerStream {
       }
     }
 
-    parent
-      .notify(SendWs::new(
-        id,
-        OutgoingMessage::Disconnect(messages::Disconnect {
-          reason: messages::DisconnectReason::Unknown,
-          message: "Server connection closed".to_string(),
-        }),
-      ))
-      .await?;
+    if !disconnect_handled {
+      parent
+        .notify(SendWs::new(
+          id,
+          OutgoingMessage::Disconnect(messages::Disconnect {
+            reason: messages::DisconnectReason::Unknown,
+            message: "Server connection closed".to_string(),
+          }),
+        ))
+        .await?;
+    }
 
     parent
       .notify(ControllerEventData::Disconnected.wrap(id))