Merge pull request #79163 from anvilfolk/fullscripterror

GDScript: Add static analysis error reporting in GDScriptCache::get_full_script()
godotengine · Jul 14, 2023 · d5a30f7 · d5a30f7
2 parents f0c24f3 + 9550496
commit d5a30f7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modules/gdscript/gdscript_cache.cpp b/modules/gdscript/gdscript_cache.cpp
@@ -294,16 +294,19 @@ Ref<GDScript> GDScriptCache::get_full_script(const String &p_path, Error &r_erro
 
 	if (p_update_from_disk) {
 		r_error = script->load_source_code(p_path);
+		if (r_error) {
+			return script;
+		}
 	}
 
+	r_error = script->reload(true);
 	if (r_error) {
 		return script;
 	}
 
 	singleton->full_gdscript_cache[p_path] = script;
 	singleton->shallow_gdscript_cache.erase(p_path);
 
-	script->reload(true);
 	return script;
 }