Repository navigation
fix(options): Prevent crash when Advanced Display window is missing - #631
Open
sentry[bot] wants to merge 1 commit into
Open
sentry[bot] wants to merge 1 commit into
sentry[bot] wants to merge 1 commit into
Conversation
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.
This PR addresses a fatal
EXCEPTION_ACCESS_VIOLATION_READcrash (CLIENT-580) that occurred when opening the Options Menu.Root Cause:
The
OptionsMenuInitfunction, along withshowAdvancedOptions,acceptAdvancedOptions, andcancelAdvancedOptions, would attempt to callwinHide(TRUE)on theWinAdvancedDisplayGameWindow pointer without first checking if the pointer was valid.WinAdvancedDisplaycould be null ifTheWindowManager->winGetWindowFromId(nullptr, "OptionsMenu.wnd:WinAdvancedDisplayOptions")failed to find the specified window in the loaded UI layout (e.g., due to a modified or incompleteOptionsMenu.wndfile).Fix:
Added null checks for
WinAdvancedDisplaybefore any calls towinHidein:Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cppGeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cppThis ensures that if the
WinAdvancedDisplayOptionswindow is not found in the UI layout, the game will no longer crash, and the Options Menu will simply open without the advanced display panel.Fixes CLIENT-580
@sentry <feedback>: Autofix iterates on these changes@sentry stop iterating: Autofix stops iterating on this runThis PR was automatically generated by Sentry. You can adjust this setting at any time.