diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-03 17:13:08 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-03 17:13:08 +0200 |
| commit | 3a990e36e69cd14512c7b8a9fb13a1ff61036ee2 (patch) | |
| tree | 1f2e065795cade5f8a26ce6b68492426c86cb477 /scene/2d/node_2d.cpp | |
| parent | c3046f4c0dbb153af192f246ce504cecf1794128 (diff) | |
| parent | 12a2177967fcea62c8242787dc3328d5b09b397a (diff) | |
| download | redot-engine-3a990e36e69cd14512c7b8a9fb13a1ff61036ee2.tar.gz | |
Merge pull request #80752 from bitsawer/fix_thread_guard
Fix CanvasItem notification thread guard
Diffstat (limited to 'scene/2d/node_2d.cpp')
| -rw-r--r-- | scene/2d/node_2d.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp index 3ba81dba88..0a5f696992 100644 --- a/scene/2d/node_2d.cpp +++ b/scene/2d/node_2d.cpp @@ -424,14 +424,17 @@ Point2 Node2D::to_global(Point2 p_local) const { } void Node2D::_notification(int p_notification) { - ERR_THREAD_GUARD; switch (p_notification) { case NOTIFICATION_ENTER_TREE: { + ERR_MAIN_THREAD_GUARD; + if (get_viewport()) { get_parent()->connect(SNAME("child_order_changed"), callable_mp(get_viewport(), &Viewport::gui_set_root_order_dirty), CONNECT_REFERENCE_COUNTED); } } break; case NOTIFICATION_EXIT_TREE: { + ERR_MAIN_THREAD_GUARD; + if (get_viewport()) { get_parent()->disconnect(SNAME("child_order_changed"), callable_mp(get_viewport(), &Viewport::gui_set_root_order_dirty)); } |