From 415699fec551795ccf1df811ee33a923713d93fe Mon Sep 17 00:00:00 2001
From: MhaWay <Manu573@live.it>
Date: Fri, 15 May 2026 16:38:00 +0200
Subject: [PATCH] Delay bootstrap reconnect until main menu

---
 ...otstrapConfiguratorWindow.BootstrapFlow.cs | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/Source/Client/Windows/BootstrapConfiguratorWindow.BootstrapFlow.cs b/Source/Client/Windows/BootstrapConfiguratorWindow.BootstrapFlow.cs
index e2ff80c1..d2ecefb5 100644
--- a/Source/Client/Windows/BootstrapConfiguratorWindow.BootstrapFlow.cs
+++ b/Source/Client/Windows/BootstrapConfiguratorWindow.BootstrapFlow.cs
@@ -334,19 +334,27 @@ private void FinalizeBootstrapSave(string path)
     private void ReturnToMenuAndReconnect()
     {
         GenScene.GoToMainMenu();
-        OnMainThread.Enqueue(() =>
+        LongEventHandler.ExecuteWhenFinished(ReconnectAfterReturningToMenu);
+    }
+
+    private void ReconnectAfterReturningToMenu()
+    {
+        if (Current.ProgramState != ProgramState.Entry || Current.Game != null)
         {
-            saveUploadStatus = "Reconnecting to upload save...";
-            Multiplayer.StopMultiplayer();
+            saveUploadStatus = "Waiting to finish returning to menu...";
+            LongEventHandler.ExecuteWhenFinished(ReconnectAfterReturningToMenu);
+            return;
+        }
 
-            if (reconnectConnector == null)
-            {
-                saveUploadStatus = "No connector available to reconnect to the bootstrap server.";
-                return;
-            }
+        saveUploadStatus = "Reconnecting to upload save...";
+
+        if (reconnectConnector == null)
+        {
+            saveUploadStatus = "No connector available to reconnect to the bootstrap server.";
+            return;
+        }
 
-            ClientUtil.TryConnectWithWindow(reconnectConnector, false);
-        });
+        ClientUtil.TryConnectWithWindow(reconnectConnector, false);
     }
 
     private void StartUploadSaveZip()