Skip to content
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.

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

Fix deadlock in 1.16.0.rc-1 - release-1.16 #5270

Merged
merged 1 commit into from
Feb 18, 2025

Conversation

kwvanderlinde
Copy link
Collaborator

@kwvanderlinde kwvanderlinde commented Feb 18, 2025

Identify the Bug or Feature request

Fixes #5268

Description of the Change

PR #5269 accidentally targetted develop instead of release-1.16. This PR ports it to 1.16 so the RC can be fixed.

Possible Drawbacks

None

Documentation Notes

N/A

Release Notes

  • Fixed a bug where macros were run on the wrong thread and could deadlock.

This change is Reviewable

This mimics what would happen if the local connection went through a handshake and received the `SetCampaignMsg`, which
occurs on the Swing thread.
@kwvanderlinde kwvanderlinde self-assigned this Feb 18, 2025
@github-actions github-actions bot added the bug label Feb 18, 2025
@kwvanderlinde kwvanderlinde linked an issue Feb 18, 2025 that may be closed by this pull request
@cwisniew cwisniew merged commit 881260e into RPTools:release-1.16 Feb 18, 2025
10 checks passed
@kwvanderlinde kwvanderlinde deleted the bugfix/5268-deadlock branch February 18, 2025 18:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

[Bug]: Deadlock when running a server
2 participants