summaryrefslogtreecommitdiff
path: root/scene/main
diff options
context:
space:
mode:
authorreduz <reduzio@gmail.com>2015-12-29 10:01:29 -0300
committerreduz <reduzio@gmail.com>2015-12-29 10:01:29 -0300
commit2f19260fb7b7479eab6ad905683cbef8126fc0e8 (patch)
tree52fbb441e7ccbc4e0b5f728c6fcbc8756014b28b /scene/main
parent45ad1024e12ffa6db0e56cb36c007dd212d5e37e (diff)
-restrict gui root from being removed while performing input, fixes #2578
Diffstat (limited to 'scene/main')
-rw-r--r--scene/main/node.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 2b2a188e76..f5252cf446 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -802,6 +802,7 @@ void Node::remove_child(Node *p_child) {
}
ERR_FAIL_COND( idx==-1 );
+ ERR_FAIL_COND( p_child->data.blocked > 0 );
//if (data.scene) { does not matter