Fix crash when displaying weapon name #55500
Merged
Conversation
This file contains 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
github-actions
bot
added
json-styled
Maleclypse
added
<Bugfix>
github-actions
bot
added
the
BasicBuildPassed
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.
Summary
None
Purpose of change
Fixes #55490.
Fixes #55505.
Minor regression from #55377. There's a null dereference when displaying the weapon name for a gunmod that also acts as a gun (ex: underslung shotgun).
Describe the solution
Check if the current mode is invalid, and use the weapon's display name instead.
Describe alternatives you've considered
Gunmods should probably have a mode set by default, but
"DEFAULT"isn't valid on gunmods because it would conflict with the parent gun's default mode.Testing
Tested by spawning a few items and checking the weapon name. Switched modes on the M4 to make sure the changes from #55377 are still working. Also crafted the underslung shotgun to check that the case in the linked issue is fixed as well.
Additional context