summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-01-12 12:56:13 +0100
committerGitHub <noreply@github.com>2021-01-12 12:56:13 +0100
commitbd07c5b7a8f6daa95a5cfa7a9f5c663a2553fd35 (patch)
treef4b43d51163795d7d091558162be1bd64c090aef /scene
parent65b77a5d35274fe86f75bdbc0e4444a9b84b1fca (diff)
parent56734f44e58b8c94b04c0d90ddb931a01a30f75d (diff)
Merge pull request #45123 from qarmin/errors_tab_container
Fix errors when removing non Control node from TabContainer
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/tab_container.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp
index 7f0d7b6e7b..64a2a1843d 100644
--- a/scene/gui/tab_container.cpp
+++ b/scene/gui/tab_container.cpp
@@ -789,6 +789,10 @@ Control *TabContainer::get_current_tab_control() const {
void TabContainer::remove_child_notify(Node *p_child) {
Container::remove_child_notify(p_child);
+ if (!Object::cast_to<Control>(p_child)) {
+ return;
+ }
+
call_deferred("_update_current_tab");
p_child->disconnect("renamed", callable_mp(this, &TabContainer::_child_renamed_callback));