activity_actor: fix segfault in drop activities #45643
Merged
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
SUMMARY: Bugfixes "Fix segfault in drop activity"
Purpose of change
Minor oversight in
obtain_activity_items
can lead to a segfault.Fixes: #45633
Describe the solution
restack pocket after manipulating charges
also restack pocket when changing favorite status from inventory menu
Describe alternatives you've considered
N/A
Testing
Start with a plastic bag. Insert 10x aspirin, then favorite the aspirins. Insert one more aspirin then favorite the
aspirin (1)
. The aspirins should be stacked now.To test for the segfault, revert the one-line change in
game.cpp
then drop the favoritedaspirin (1)
(which is not stacked in this case)Additional context
N/A