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

Corrected Save Scene and Save All Scenes not working when the scene's dir no longer exists

Browse Source
This commit is contained in:
Matthew Newall
2021-09-11 01:35:13 +00:00
parent 43e96e0c65
commit ed2280528f
2 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
editor/editor_node.cpp
View File

@@ -1742,13 +1742,15 @@ void EditorNode::restart_editor() {
void EditorNode::_save_all_scenes() {
for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
Node *scene = editor_data.get_edited_scene_root(i);
if (scene && scene->get_filename() != "") {
if (scene && scene->get_filename() != "" && DirAccess::exists(scene->get_filename().get_base_dir())) {
if (i != editor_data.get_edited_scene()) {
_save_scene(scene->get_filename(), i);
} else {
_save_scene_with_preview(scene->get_filename());
}
} // else: ignore new scenes
} else {
show_warning(TTR("Could not save one or more scenes!"), TTR("Save All Scenes"));
}
}
_save_default_environment();
@@ -2469,20 +2471,22 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
case SCENE_TAB_CLOSE:
case FILE_SAVE_SCENE: {
int scene_idx = (p_option == FILE_SAVE_SCENE) ? -1 : tab_closing;
Node *scene = editor_data.get_edited_scene_root(scene_idx);
if (scene && scene->get_filename() != "") {
if (scene_idx != editor_data.get_edited_scene()) {
_save_scene_with_preview(scene->get_filename(), scene_idx);
if (DirAccess::exists(scene->get_filename().get_base_dir())) {
if (scene_idx != editor_data.get_edited_scene()) {
_save_scene_with_preview(scene->get_filename(), scene_idx);
} else {
_save_scene_with_preview(scene->get_filename());
}
if (scene_idx != -1) {
_discard_changes();
}
save_layout();
} else {
_save_scene_with_preview(scene->get_filename());
show_save_accept(vformat(TTR("%s no longer exists! Please specify a new save location."), scene->get_filename().get_base_dir()), TTR("OK"));
}
if (scene_idx != -1) {
_discard_changes();
}
save_layout();
break;
}
[[fallthrough]];
@@ -4139,6 +4143,13 @@ void EditorNode::show_accept(const String &p_text, const String &p_title) {
accept->popup_centered();
}
void EditorNode::show_save_accept(const String &p_text, const String &p_title) {
current_option = -1;
save_accept->get_ok_button()->set_text(p_title);
save_accept->set_text(p_text);
save_accept->popup_centered();
}
void EditorNode::show_warning(const String &p_text, const String &p_title) {
if (warning->is_inside_tree()) {
warning->set_text(p_text);
@@ -6254,6 +6265,10 @@ EditorNode::EditorNode() {
gui_base->add_child(accept);
accept->connect("confirmed", callable_mp(this, &EditorNode::_menu_confirm_current));
save_accept = memnew(AcceptDialog);
gui_base->add_child(save_accept);
save_accept->connect("confirmed", callable_mp(this, &EditorNode::_menu_option), make_binds((int)MenuOptions::FILE_SAVE_AS_SCENE));
project_export = memnew(ProjectExportDialog);
gui_base->add_child(project_export);