asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix crash when deleting Camera2D and Viewport assigned to it

Browse source
This commit is contained in:
Haoyu Qiu 2021-10-06 13:41:21 +08:00
parent df69945f1f
commit 0f18f225ee
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scene/2d/camera_2d.cpp
View file

@ -259,12 +259,13 @@ void Camera2D::_notification(int p_what) {
} break; } break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
const bool viewport_valid = !custom_viewport || ObjectDB::get_instance(custom_viewport_id);
if (is_current()) { if (is_current()) {
if (viewport && !(custom_viewport && !ObjectDB::get_instance(custom_viewport_id))) { if (viewport && viewport_valid) {
viewport->set_canvas_transform(Transform2D()); viewport->set_canvas_transform(Transform2D());
} }
} }
if (viewport) { if (viewport && viewport_valid) {
viewport->disconnect("size_changed", this, "_update_scroll"); viewport->disconnect("size_changed", this, "_update_scroll");
} }
remove_from_group(group_name); remove_from_group(group_name);