From 445302a4b28fa007e56f600fc73c178898c114fe Mon Sep 17 00:00:00 2001 From: kobewi Date: Fri, 12 Apr 2024 11:42:08 +0200 Subject: [PATCH] Improve error when scene/resource is saved with newer format --- editor/editor_node.cpp | 5 +++++ scene/resources/resource_format_text.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 182d249073b..353b9f56995 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1445,6 +1445,9 @@ void EditorNode::_dialog_display_load_error(String p_file, Error p_error) { case ERR_FILE_NOT_FOUND: { show_accept(vformat(TTR("Missing file '%s' or one of its dependencies."), p_file.get_file()), TTR("OK")); } break; + case ERR_FILE_UNRECOGNIZED: { + show_accept(vformat(TTR("File '%s' is saved in a format that is newer than the formats supported by this version of Godot, so it can't be opened."), p_file.get_file()), TTR("OK")); + } break; default: { show_accept(vformat(TTR("Error while loading file '%s'."), p_file.get_file()), TTR("OK")); } break; @@ -6642,6 +6645,8 @@ EditorNode::EditorNode() { main_menu->set_menu_tooltip(0, TTR("Operations with scene files.")); accept = memnew(AcceptDialog); + accept->set_autowrap(true); + accept->set_min_size(Vector2i(600, 0)); accept->set_unparent_when_invisible(true); save_accept = memnew(AcceptDialog); diff --git a/scene/resources/resource_format_text.cpp b/scene/resources/resource_format_text.cpp index 07868e7e499..98a12f14006 100644 --- a/scene/resources/resource_format_text.cpp +++ b/scene/resources/resource_format_text.cpp @@ -1067,7 +1067,7 @@ void ResourceLoaderText::open(Ref p_f, bool p_skip_first_tag) { if (fmt > FORMAT_VERSION) { error_text = "Saved with newer format version"; _printerr(); - error = ERR_PARSE_ERROR; + error = ERR_FILE_UNRECOGNIZED; return; } }