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

ResourceLoader: Handle another case of user tokens #96218

Merged
merged 1 commit into from
Aug 28, 2024
Merged

ResourceLoader: Handle another case of user tokens #96218

merged 1 commit into from
Aug 28, 2024
+5 −0

Conversation

RandomShaper
Copy link
Member

@RandomShaper RandomShaper commented Aug 28, 2024 •
edited
Loading

A case that df23858 failed to handle.

This fixes a case like this:

  • User code starts loading resource A.
  • The system starts loading resource B as it's a dependency of A.
  • User code starts loading explicitly resource B.
  • User code queries status or tries to retrieve the result of loading B. The resource loader will find no user tokens corresponding to that resource, so an error will be returned.

@RandomShaper RandomShaper added bug topic:core cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release labels Aug 28, 2024
@RandomShaper RandomShaper added this to the 4.4 milestone Aug 28, 2024
@RandomShaper RandomShaper marked this pull request as ready for review August 28, 2024 12:43
@RandomShaper RandomShaper requested a review from a team as a code owner August 28, 2024 12:43
@akien-mga akien-mga merged commit 9f05ca9 into godotengine:master Aug 28, 2024
18 checks passed
@akien-mga
Copy link
Member

Thanks!

@RandomShaper RandomShaper deleted the res_loader_user_case branch August 28, 2024 16:45
@RandomShaper RandomShaper mentioned this pull request Sep 5, 2024
Open
@RandomShaper
Copy link
Member Author

Cherry-pick for 4.3 included in #96606.

@akien-mga akien-mga removed the cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release label Sep 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akien-mga akien-mga akien-mga approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@RandomShaper @akien-mga