Skip to content

Reset bootstrap client mode after save upload#923

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

Reset bootstrap client mode after save upload#923
notfood merged 1 commit into
rwmt:devfrom
MhaWay:Multiplayer-Boostrap-client-fix

Conversation

@MhaWay
Copy link
Copy Markdown
Contributor

@MhaWay MhaWay commented May 15, 2026

Summary

  • add a client-side bootstrap teardown path that runs on disconnect only after save upload has started
  • preserve the intentional reconnect flow before upload, but clear bootstrap state once the upload-complete disconnect happens
  • reset lingering bootstrap window/coordinator state so later singleplayer starts do not re-enter bootstrap mode

Testing

  • dotnet build .\Client\Multiplayer.csproj

Copilot AI review requested due to automatic review settings May 15, 2026 08:01
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 updates the bootstrap configurator disconnect handling so client-side bootstrap state is torn down after save upload flow completion, preventing stale bootstrap state from affecting later singleplayer starts.

Changes:

  • Adds ExitBootstrapMode to reset bootstrap UI, upload, coordinator, and window state.
  • Tracks when save upload has started so disconnect handling can optionally clear pending upload state.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File Description
Source/Client/Windows/BootstrapConfiguratorWindow.cs Adds bootstrap teardown/reset logic and routes disconnects through it.
Source/Client/Windows/BootstrapConfiguratorWindow.BootstrapFlow.cs Adds upload-start disconnect tracking around save.zip upload.

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

{
ResetTransientUiState(resetServerDrivenState: true);
Find.WindowStack.TryRemove(this);
ExitBootstrapMode(clearPendingUploadState: closeBootstrapModeOnDisconnect);
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Tecnically not an issue, reconnecting to the server will set it all up and go on with it

{
try
{
closeBootstrapModeOnDisconnect = true;
@notfood notfood added fix Fixes for a bug or desync. 1.6 Fixes or bugs relating to 1.6 (Not Odyssey). labels May 15, 2026
@MhaWay
Copy link
Copy Markdown
Contributor Author

MhaWay commented May 15, 2026

Still related to standalone server bootstrap behaviour

@notfood notfood added the standalone server Fix or bugs relating to the standalone server. label May 15, 2026
@notfood notfood merged commit dd7259a 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