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 Node::add_sibling parent check #78847

Merged
merged 1 commit into from Jul 8, 2023
Merged

Fix Node::add_sibling parent check #78847

merged 1 commit into from Jul 8, 2023

Conversation

Sauermann
Copy link
Contributor

Replace data.blocked > 0 by data.parent->data.blocked > 0 in order to check if the parent is busy.

implement #78834 (comment) and #78834 (comment)

@Sauermann
Fix Node::add_sibling parent check
b02dff6 
Replace `data.blocked > 0` by `data.parent->data.blocked > 0` in order
to check if the parent is busy.
@Sauermann Sauermann requested a review from a team as a code owner June 29, 2023 18:23
@akien-mga akien-mga added this to the 4.2 milestone Jun 30, 2023
@akien-mga akien-mga added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Jun 30, 2023
YuriSizov
YuriSizov approved these changes Jun 30, 2023
View reviewed changes
Copy link
Contributor

@YuriSizov YuriSizov left a comment

Choose a reason for hiding this comment

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

Change makes sense. Would be worth to check the example provided in the other PR in case we still crash because of some other condition being met. But it can be done separately, perhaps even in the original PR.

@YuriSizov YuriSizov mentioned this pull request Jul 3, 2023
Open
@akien-mga akien-mga merged commit 0df4237 into godotengine:master Jul 8, 2023
13 checks passed
@akien-mga
Copy link
Member

Thanks!

@Sauermann Sauermann deleted the fix-sibling-fail branch July 8, 2023 21:58
@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Jul 10, 2023
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.1.

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

@YuriSizov YuriSizov YuriSizov approved these changes

@RandomShaper RandomShaper RandomShaper approved these changes

Assignees
No one assigned
Labels
bug crash topic:core
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Sauermann @akien-mga @YuriSizov @RandomShaper @AThousandShips