summaryrefslogtreecommitdiff
path: root/scene/main/node.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-12-26 11:43:02 -0300
committerGitHub <noreply@github.com>2017-12-26 11:43:02 -0300
commit02e883713aa4a36c83e64d242c8bd009f89d10c3 (patch)
tree64c49ccb9f854424c482e7acae44654b245f2c87 /scene/main/node.cpp
parent2b31155baa48788327c927007decc4621a6bf19a (diff)
parentff68b80df7e08a2fcae3b3ace56be1d9bee73235 (diff)
Merge pull request #14977 from volzhs/fix-crash-group
Fix crash & error at saving scene
Diffstat (limited to 'scene/main/node.cpp')
-rw-r--r--scene/main/node.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index de1ab9959a..942a6d5428 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -340,7 +340,8 @@ void Node::move_child(Node *p_child, int p_pos) {
data.children[i]->notification(NOTIFICATION_MOVED_IN_PARENT);
}
for (const Map<StringName, GroupData>::Element *E = p_child->data.grouped.front(); E; E = E->next()) {
- E->get().group->changed = true;
+ if (E->get().group)
+ E->get().group->changed = true;
}
data.blocked--;