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

Merge pull request #54170 from miraz12/fix-color-picker-notification33-crash

Browse Source
This commit is contained in:
Rémi Verschelde 2021-10-25 11:15:52 +02:00 committed by GitHub
commit fe0cbe6e53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/gui/control.cpp
View File

@ -525,7 +525,9 @@ void Control::_notification(int p_notification) {
data.SI = get_viewport()->_gui_add_subwindow_control(this);
} else {
//is a regular root control
data.RI = get_viewport()->_gui_add_root_control(this);
Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport);
data.RI = viewport->_gui_add_root_control(this);
}
data.parent_canvas_item = get_parent_item();
@ -534,7 +536,9 @@ void Control::_notification(int p_notification) {
data.parent_canvas_item->connect("item_rect_changed", this, "_size_changed");
} else {
//connect viewport
get_viewport()->connect("size_changed", this, "_size_changed");
Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport);
viewport->connect("size_changed", this, "_size_changed");
}
}
@ -552,7 +556,9 @@ void Control::_notification(int p_notification) {
data.parent_canvas_item = nullptr;
} else if (!is_set_as_toplevel()) {
//disconnect viewport
get_viewport()->disconnect("size_changed", this, "_size_changed");
Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport);
viewport->disconnect("size_changed", this, "_size_changed");
}
if (data.MI) {