noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #114032 from syntaxerror247/editor-settings-reg

Browse Source 
Fix editor settings parsing regression on Android
This commit is contained in:
Rémi Verschelde
2026-01-07 01:41:36 +01:00
parent 8254d13836 326217dc0f
commit 3caa11c75d
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scene/resources/resource_format_text.cpp
View File

@@ -419,18 +419,17 @@ Ref<PackedScene> ResourceLoaderText::_parse_node_tag(VariantParser::ResourcePars
}
void ResourceLoaderText::_count_resources() {
Ref<FileAccess> scan_f = FileAccess::open(f->get_path(), FileAccess::READ);
if (scan_f.is_null()) {
return;
}
resources_total = 0;
resource_current = 0;
// Save current file position to restore after counting.
uint64_t original_pos = f->get_position();
// Seek to beginning to count all resources.
f->seek(0);
bool has_main_resource = false;
while (!f->eof_reached()) {
String line = f->get_line().strip_edges();
while (!scan_f->eof_reached()) {
String line = scan_f->get_line().strip_edges();
// Only count resources that contribute to progress
// (ext_resources are loaded asynchronously and don't count).
@@ -446,9 +445,6 @@ void ResourceLoaderText::_count_resources() {
}
}
}
// Restore original file position.
f->seek(original_pos);
}
Error ResourceLoaderText::load() {