diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-20 15:09:04 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-20 15:09:04 +0200 |
commit | 7270da76bae70172b413ad4a65176ea23df00be6 (patch) | |
tree | 60e31b5ee568e919f7fab65ebb3de69f053bd0d1 | |
parent | 15955e5d9e5fc13744e0cb7f77a9ef84676d3510 (diff) | |
parent | 2d262c072bacc6f207e60c10fafad065388029a6 (diff) | |
download | redot-engine-7270da76bae70172b413ad4a65176ea23df00be6.tar.gz |
Merge pull request #83540 from mattbork/get_shallow_script_fix
Fix `GDScriptCache::get_full_script` eating parsing errors because of early exit
-rw-r--r-- | modules/gdscript/gdscript_cache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_cache.cpp b/modules/gdscript/gdscript_cache.cpp index 18609d0b80..26f01ec218 100644 --- a/modules/gdscript/gdscript_cache.cpp +++ b/modules/gdscript/gdscript_cache.cpp @@ -287,7 +287,8 @@ Ref<GDScript> GDScriptCache::get_full_script(const String &p_path, Error &r_erro if (script.is_null()) { script = get_shallow_script(p_path, r_error); - if (r_error) { + // Only exit early if script failed to load, otherwise let reload report errors. + if (script.is_null()) { return script; } } |