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.

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

Ensure root is set in both worlds. #174

Merged
merged 11 commits into from
Apr 17, 2024
Merged

Ensure root is set in both worlds. #174

merged 11 commits into from
Apr 17, 2024

Conversation

wmdietl
Copy link
Collaborator

@wmdietl wmdietl commented Apr 15, 2024

Fixes #159, for real, hopefully.

This PR contains all changes in #173, so review and merge that first.

@wmdietl wmdietl mentioned this pull request Apr 15, 2024
Copy link
Collaborator

@cpovirk cpovirk left a comment

Choose a reason for hiding this comment

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

This PR contains all changes in #173, so review and merge that first.

I just diffed it against #173 at the command line :) But I'll go review that one now.

(Yay!)

withMostConvenientWorld.setRoot(root);
}
}
settingRoot = false;
Copy link
Collaborator

Choose a reason for hiding this comment

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

I might have expected for this to appear inside the if so that that block both sets to true and sets to false. That would also mean that, if someone tried to call setRoot twice while a call was already active, then it would still be a no-op.

But I see no reason to think that the current code is a problem.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, definitely nicer in the block. I've moved the assignment.

@wmdietl
Copy link
Collaborator Author

wmdietl commented Apr 16, 2024

I just diffed it against #173 at the command line :) But I'll go review that one now.

Sorry, should have highlighted that f1fbe5a is the "meat" of this PR.

@cpovirk
Copy link
Collaborator

cpovirk commented Apr 16, 2024

I've confirmed that this fixes the crashes from my testing in the Google depot.

@wmdietl wmdietl merged commit 68e9072 into main-eisop Apr 17, 2024
1 of 3 checks passed
@wmdietl wmdietl deleted the issue-159-again branch April 17, 2024 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants