Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug when re-killing Entity after atomic killing followed by alloc #533

Merged
merged 1 commit into from
Jan 4, 2019
Merged

Fix bug when re-killing Entity after atomic killing followed by alloc #533

merged 1 commit into from
Jan 4, 2019

Conversation

torkleyy
Copy link
Member

@torkleyy torkleyy commented Jan 3, 2019 •
edited
Loading

Fixes #514

This change is Reviewable

@torkleyy torkleyy added the bug label Jan 3, 2019
@torkleyy torkleyy mentioned this pull request Jan 3, 2019
Closed
azriel91
azriel91 approved these changes Jan 3, 2019
View reviewed changes
Copy link
Member

@azriel91 azriel91 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woosh, without knowing what each of the bits are, it's a brain bender figuring out if that change was correct.

@torkleyy
Copy link
Member Author

torkleyy commented Jan 4, 2019

Heh, thanks for taking a look. When I thought about atomic deletions going on followed by a delete_all, I immediately checked the allocator and what happened was that its merge would still merge the deletion as if it was performed atomically.

bors r+

bors bot added a commit that referenced this pull request Jan 4, 2019
@bors @torkleyy
Merge #533
b05aaf6 
533: Fix bug when re-killing Entity after atomic killing followed by alloc r=torkleyy a=torkleyy

Fixes #514



Co-authored-by: Thomas Schaller <torkleyy@gmail.com>
@bors
Copy link
Contributor

bors bot commented Jan 4, 2019

Build succeeded

@bors bors bot merged commit f12546d into amethyst:master Jan 4, 2019
@torkleyy torkleyy deleted the rekill branch January 4, 2019 08:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azriel91 azriel91 azriel91 approved these changes

Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@torkleyy @azriel91