godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Avoid crashing when dependencies on inherited/instanced scenes cant be satisfied, fixes #15298

Browse Source
This commit is contained in:
Juan Linietsky
2018-01-05 19:02:54 -03:00
parent b1ab44aa05
commit 061db1ca95
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
editor/editor_node.cpp
View File

@@ -1021,7 +1021,7 @@ void EditorNode::_save_scene(String p_file, int idx) {
current_option = -1; current_option = -1;
accept->get_ok()->set_text(TTR("I see..")); accept->get_ok()->set_text(TTR("I see.."));
accept->set_text(TTR("Couldn't save scene. Likely dependencies (instances) couldn't be satisfied.")); accept->set_text(TTR("Couldn't save scene. Likely dependencies (instances or inheritance) couldn't be satisfied."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return; return;
} }
@@ -1029,6 +1029,13 @@ void EditorNode::_save_scene(String p_file, int idx) {
// force creation of node path cache // force creation of node path cache
// (hacky but needed for the tree to update properly) // (hacky but needed for the tree to update properly)
Node *dummy_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE); Node *dummy_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE);
if (!dummy_scene) {
current_option = -1;
accept->get_ok()->set_text(TTR("I see.."));
accept->set_text(TTR("Couldn't save scene. Likely dependencies (instances or inheritance) couldn't be satisfied."));
accept->popup_centered_minsize();
return;
}
memdelete(dummy_scene); memdelete(dummy_scene);
int flg = 0; int flg = 0;