godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #76954 from Rindbee/return-null-on-fail-load-script

Browse Source 
Returns null and does not cache when the source code of the script fails to load
This commit is contained in:
Rémi Verschelde
2023-06-19 21:17:47 +02:00
parent 7b170d12cf cbce374f68
commit 5f9175f969
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/gdscript/gdscript.cpp
View File

@@ -2596,20 +2596,12 @@ Ref<GDScript> GDScriptLanguage::get_script_by_fully_qualified_name(const String
/*************** RESOURCE ***************/
Ref<Resource> ResourceFormatLoaderGDScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
if (r_error) {
*r_error = ERR_FILE_CANT_OPEN;
}
Error err;
Ref<GDScript> scr = GDScriptCache::get_full_script(p_path, err, "", p_cache_mode == CACHE_MODE_IGNORE);
if (scr.is_null()) {
// Don't fail loading because of parsing error.
scr.instantiate();
}
if (r_error) {
*r_error = OK;
// Don't fail loading because of parsing error.
*r_error = scr.is_valid() ? OK : err;
}
return scr;