Skip to content

bugfix(gamewindow): Remove destroyed windows from the modal stack and prevent duplicate modals for the same window - #643

Closed
tintinhamans wants to merge 1 commit into
GeneralsOnlineDevelopmentTeam:mainfrom
tintinhamans:arctic/go/fix/modal-stack-upstream
Closed

tintinhamans wants to merge 1 commit into
GeneralsOnlineDevelopmentTeam:mainfrom
tintinhamans:arctic/go/fix/modal-stack-upstream

Conversation

@tintinhamans

@tintinhamans tintinhamans commented Oct 22, 2026 •

Copy link
Copy Markdown

Ports TheSuperHackers#3224 (cherry-pick -x), replacing the approach of #583.

winUnsetModal now removes the window from anywhere in the modal stack and winDestroy calls it unconditionally, so the removeWindowFromModalStack helper goes away. winSetModal moves a window that is already modal to the top instead of adding a second entry. processDestroyList drops its duplicate cleanup and asserts nothing points at the window.

Applied to both Generals and GeneralsMD, identical to upstream.

… prevent duplicate modals for the same window (TheSuperHackers#3224)

(cherry picked from commit 6512dc6)
@tintinhamans

Copy link
Copy Markdown
Author

Folded into #638.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant