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

Fix Godot not quitting with --doctool --gdscript-docs. #95656

Merged
merged 1 commit into from
Aug 16, 2024

Conversation

anvilfolk
Copy link
Contributor

@anvilfolk anvilfolk commented Aug 16, 2024

#82116 moved GDScript doctool code to after Autoloads were loaded. However, to get there, Main::start() also selects a main loop, and thus starts running and does not quit. This PR fixes the issue by forcing Godot to quit after 1 main loop iteration.

It feels a lot easier than untangling the exact dependencies (and no more, e.g. Autoloads, which use ResourceLoader and may preload lots of different things, etc) that are needed to generate docs and then refactoring Main::start() order to have GDScript doctool happen at the exact "right time". It also feels better than adding GDScript-specific code that deletes previously created main loops!

@anvilfolk anvilfolk requested a review from a team as a code owner August 16, 2024 20:11
@Calinou Calinou added bug topic:gdscript cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release labels Aug 16, 2024
@Calinou Calinou added this to the 4.4 milestone Aug 16, 2024
@akien-mga
Copy link
Member

akien-mga commented Aug 16, 2024

The commit message got mangled (likely Unix shell interpreting ` as a command to run).

@anvilfolk
Copy link
Contributor Author

The commit message got mangled (likely Unix shell interpreting ` as a command to run).

Thanks for the heads up! Should be fixed!

@akien-mga akien-mga merged commit 1bd740d into godotengine:master Aug 16, 2024
17 checks passed
@akien-mga
Copy link
Member

Thanks!

@anvilfolk
Copy link
Contributor Author

Thank you, glad to be back <3

@anvilfolk anvilfolk deleted the gdscript-docs-quit branch August 16, 2024 22:57
@akien-mga
Copy link
Member

Cherry-picked for 4.3.1.

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

Successfully merging this pull request may close these issues.

3 participants