Skip to content

Delay bootstrap reconnect until main menu#925

Merged
notfood merged 1 commit into
rwmt:devfrom
MhaWay:Multiplayer-post-save-fix
May 15, 2026
Merged

Delay bootstrap reconnect until main menu#925
notfood merged 1 commit into
rwmt:devfrom
MhaWay:Multiplayer-post-save-fix

Conversation

@MhaWay
Copy link
Copy Markdown
Contributor

@MhaWay MhaWay commented May 15, 2026

Summary

Wait for the client to fully return to the main menu before reconnecting to upload the bootstrap save.

Testing

  • dotnet build .\Client\Multiplayer.csproj

Copilot AI review requested due to automatic review settings May 15, 2026 14:38
@MhaWay
Copy link
Copy Markdown
Contributor Author

MhaWay commented May 15, 2026

Marking this as urgent for tester validation: bootstrap currently reconnects immediately after save creation before the client fully returns to the main menu, so this fix is intended to unblock the bootstrap flow. If maintainers agree, this likely fits the high priority label.

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adjusts the bootstrap save flow to delay reconnecting (to upload the bootstrap save) until the client has fully returned to the RimWorld main menu / entry state.

Changes:

  • Replace the immediate main-thread reconnect step with a LongEventHandler.ExecuteWhenFinished callback after GenScene.GoToMainMenu().
  • Add a ReconnectAfterReturningToMenu gate that waits until Current.ProgramState == ProgramState.Entry and Current.Game == null before attempting to reconnect.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread Source/Client/Windows/BootstrapConfiguratorWindow.BootstrapFlow.cs
@notfood notfood added fix Fixes for a bug or desync. 1.6 Fixes or bugs relating to 1.6 (Not Odyssey). standalone server Fix or bugs relating to the standalone server. labels May 15, 2026
@notfood notfood merged commit 9d938d0 into rwmt:dev May 15, 2026
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.6 Fixes or bugs relating to 1.6 (Not Odyssey). fix Fixes for a bug or desync. standalone server Fix or bugs relating to the standalone server.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants