fix: coalesce window activation events through classic pending slots - #599
Open
benletchford wants to merge 1 commit into
Open
fix: coalesce window activation events through classic pending slots#599benletchford wants to merge 1 commit into
benletchford wants to merge 1 commit into
Conversation
This was referenced Aug 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cause
Systemless accumulated Window Manager activate events in an unbounded FIFO and only activated frontmost windows created visible. Classic Window Manager state instead has one replaceable
CurActivateslot and one replaceableCurDeactiveslot. During rapid window changes, the FIFO retained stale window pointers long enough for application-owned callback storage to be reused, eventually sending execution through address zero.Fix
Evidence
The Civilization II demo now proceeds through initial world generation, dismisses the first map dialog, and remains responsive to subsequent input without jumping to PC zero. Its separate terrain-rendering defect is tracked in #600 and is not changed here.
Tests
cargo fmt --checkcargo test trap::window::tests(177 passed)cargo test --lib(2,951 passed; 3 ignored)Closes #597