Browse Source

Merge pull request #107402 from mihe/lsp-uid-bug

Stop `FileAccess::fix_path` from emitting errors for invalid UIDs
Rémi Verschelde 1 month ago
parent
commit
94d7a54fea
1 changed files with 6 additions and 1 deletions
  1. 6 1
      core/io/file_access.cpp

+ 6 - 1
core/io/file_access.cpp

@@ -258,7 +258,12 @@ String FileAccess::fix_path(const String &p_path) const {
 		case ACCESS_RESOURCES: {
 		case ACCESS_RESOURCES: {
 			if (ProjectSettings::get_singleton()) {
 			if (ProjectSettings::get_singleton()) {
 				if (r_path.begins_with("uid://")) {
 				if (r_path.begins_with("uid://")) {
-					r_path = ResourceUID::uid_to_path(r_path);
+					ResourceUID::ID uid = ResourceUID::get_singleton()->text_to_id(r_path);
+					if (ResourceUID::get_singleton()->has_id(uid)) {
+						r_path = ResourceUID::get_singleton()->get_id_path(uid);
+					} else {
+						r_path.clear();
+					}
 				}
 				}
 
 
 				if (r_path.begins_with("res://")) {
 				if (r_path.begins_with("res://")) {