maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
Properly handle EOF when parsing text resource
This commit is contained in:
Rémi Verschelde 2020-02-28 22:04:40 +01:00 committed by GitHub
parent 620030b600 c9cab7ac9f
commit f3c7019177
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/resources/resource_format_text.cpp
View file

@ -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);
}