godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Respect returned bool from virtual process methods in SceneTree 

SceneTree overrides the virtual `process` and `physics_process` methods
that it inherits from MainLoop. These methods return a boolean that
determines if the main loop should end.
The SceneTree was ignoring the returned boolean, so scripts inheriting
from SceneTree that override these methods and return true didn't exit
the main loop. Now the boolean is checked.
This commit is contained in:
Raul Santos 2023-06-18 20:44:22 +02:00
parent 4a0bb80b18
commit 5373b67e2a
No known key found for this signature in database
GPG Key ID: B532473AE3A803E4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/main/scene_tree.cpp
View File

@ -456,7 +456,9 @@ bool SceneTree::physics_process(double p_time) {
flush_transform_notifications(); flush_transform_notifications();
MainLoop::physics_process(p_time); if (MainLoop::physics_process(p_time)) {
_quit = true;
}
physics_process_time = p_time; physics_process_time = p_time;
emit_signal(SNAME("physics_frame")); emit_signal(SNAME("physics_frame"));
@ -484,7 +486,9 @@ bool SceneTree::physics_process(double p_time) {
bool SceneTree::process(double p_time) { bool SceneTree::process(double p_time) {
root_lock++; root_lock++;
MainLoop::process(p_time); if (MainLoop::process(p_time)) {
_quit = true;
}
process_time = p_time; process_time = p_time;