summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-07-15 16:41:55 +0200
committerGitHub <noreply@github.com>2019-07-15 16:41:55 +0200
commit5d962f8baf9dfdbce36e6108b42e49b3f732cdfd (patch)
tree6e73fdcd956bd0d7fecce3a612070902abd3f039
parent7599f20c2e4896b820c54fb92cc328671d96aaf7 (diff)
parente9c1e5aa7ce7d4ff82adcac004833718c89560c0 (diff)
Merge pull request #30583 from hbina/fix_crash_issue_30493
Fix crashing when changing Node type.
-rw-r--r--editor/scene_tree_dock.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index 935946bf24..c43d164078 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -394,7 +394,11 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
if (!profile_allow_editing) {
break;
}
- create_dialog->popup_create(false, true, scene_tree->get_selected()->get_class());
+
+ Node *selected = scene_tree->get_selected();
+ if (selected)
+ create_dialog->popup_create(false, true, selected->get_class());
+
} break;
case TOOL_ATTACH_SCRIPT: {