From af1f7dfc7a6035c5d0b90363938323ed941bee50 Mon Sep 17 00:00:00 2001
From: "NG (Graham)" <ngniusness@gmail.com>
Date: Mon, 6 Apr 2026 11:00:46 -0400
Subject: [PATCH] Fix not returning to main menu after some game modes are
 complete

---
 rc_multiplayer/src/matches/generic.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rc_multiplayer/src/matches/generic.rs b/rc_multiplayer/src/matches/generic.rs
index 657f56b..3620686 100644
--- a/rc_multiplayer/src/matches/generic.rs
+++ b/rc_multiplayer/src/matches/generic.rs
@@ -710,7 +710,7 @@ impl <L: super::CustomGameLogic> GenericGamemodeEngine<L> {
                     if let Err(e) = conn.user.save_player_connected_status(self.game_guid(), false).await {
                         log::error!("Failed to mark player {} (user {}) as disconnected in game {}: {}", player_id, user_id, self.game_guid(), e);
                     }
-                    if !is_unregister {
+                    if !is_unregister || conn.connection.connection.is_connected() {
                         conn.connection.connection.goodbye(&conn.connection.sender).await;
                     }
                     return has_active_connections;