Browse Source

Merge pull request #36658 from reduz/fix-resource-loader-text

Properly handle EOF when parsing text resource
Rémi Verschelde 5 years ago
parent
commit
f3c7019177
1 changed files with 4 additions and 0 deletions
  1. 4 0
      scene/resources/resource_format_text.cpp

+ 4 - 0
scene/resources/resource_format_text.cpp

@@ -293,6 +293,7 @@ Ref<PackedScene> ResourceLoaderText::_parse_node_tag(VariantParser::ResourcePars
 						_printerr();
 						return Ref<PackedScene>();
 					} else {
+						error = OK;
 						return packed_scene;
 					}
 				}
@@ -367,6 +368,7 @@ Ref<PackedScene> ResourceLoaderText::_parse_node_tag(VariantParser::ResourcePars
 					_printerr();
 					return Ref<PackedScene>();
 				} else {
+					error = OK;
 					return packed_scene;
 				}
 			}
@@ -390,6 +392,7 @@ Ref<PackedScene> ResourceLoaderText::_parse_node_tag(VariantParser::ResourcePars
 					_printerr();
 					return Ref<PackedScene>();
 				} else {
+					error = OK;
 					return packed_scene;
 				}
 			}
@@ -641,6 +644,7 @@ Error ResourceLoaderText::load() {
 				if (error != ERR_FILE_EOF) {
 					_printerr();
 				} else {
+					error = OK;
 					if (!ResourceCache::has(res_path)) {
 						resource->set_path(res_path);
 					}