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

Merge pull request #9834 from RandomShaper/fix-node-crash-2.1

Browse Source 
Fix Node::move_child() crash if moving to the end plus one (2.1)
This commit is contained in:
Rémi Verschelde 2017-07-25 08:12:30 +02:00 committed by GitHub
commit ecc8382a8a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/main/node.cpp
View File

@ -274,6 +274,11 @@ void Node::move_child(Node *p_child, int p_pos) {
ERR_FAIL_COND(data.blocked > 0); ERR_FAIL_COND(data.blocked > 0);
} }
// Specifying one place beyond the end
// means the same as moving to the last position
if (p_pos == data.children.size())
p_pos--;
data.children.remove(p_child->data.pos); data.children.remove(p_child->data.pos);
data.children.insert(p_pos, p_child); data.children.insert(p_pos, p_child);