Skip to content

Delay bootstrap reconnect until main menu #925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
notfood merged 1 commit into from
May 15, 2026
Merged

Delay bootstrap reconnect until main menu #925

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions Source/Client/Windows/BootstrapConfiguratorWindow.BootstrapFlow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Comment thread
MhaWay marked this conversation as resolved.
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()
Expand Down
Loading