Ensure MainLoop and its custom script is set right after it's resolved
#70771
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kleonc
added
bug
topic:core
cherrypick:3.x
kleonc
changed the title
MainLoop is set right after it's resolved
kleonc
force-pushed
the
main-loop-set-after-resolved
branch
from
6de1e07
to
7105cd2
Compare
kleonc
changed the title
MainLoop is set right after it's resolvedMainLoop and its custom script is set right after it's resolved
kleonc
force-pushed
the
main-loop-set-after-resolved
branch
from
7105cd2
to
db48df3
Compare
reduz
reviewed
Jan 19, 2023
| @@ -2705,6 +2705,8 @@ bool Main::start() { | |||
| } | |||
| } | |||
|
|
|||
| OS::get_singleton()->set_main_loop(main_loop); | |||
There was a problem hiding this comment.
The if below handling SceneTree-derived main_loop adds nodes to the tree (autoloads, main scene), meaning it can trigger some user code. If they'd use Engine.get_main_loop() in there it would return null at this point because it was not set yet (pre moving it in here). This fixes e.g. snippet from #70764 (comment).
There was a problem hiding this comment.
Isn't it strange that main_loop (base or overriden) becomes initialized after first scene is initialized?
UPD Did some research #71695
RandomShaper
approved these changes
Jun 23, 2023
akien-mga
removed
the
cherrypick:3.5
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For a
SceneTree-derivedmain_looptheOS::get_singleton()->set_main_loop(main_loop);was called after adding AutoLoads and the main scene to the tree. This PR makes it be set right after themain_loopis resolved.Also previously setting custom script of the
main_loopwas postponed (viaMainLoop::set_initialize_script) to be done inMainLoop::initialize. This PR removesMainLoop::set_initialize_scriptand makes the script of themain_loopbe set directly right after it's instantiated.Fixes #70764.