godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[3.2] Fix 'Parameter "assembly" is null' error 

This error was normally being printed when
trying to open the project assembly while
the project was not yet built.
The error should not be printed. It's the job
of this method's caller to decide whether to
print an error or not if loading failed.
This commit is contained in:
Ignacio Etcheverry 2020-09-04 01:03:57 +02:00
parent 939ed5dd5b
commit bd18b2ff6a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mono/mono_gd/gd_mono_assembly.cpp
View File

@ -458,7 +458,9 @@ GDMonoAssembly *GDMonoAssembly::load(const String &p_name, MonoAssemblyName *p_a
if (!assembly) { if (!assembly) {
assembly = _load_assembly_search(p_name, p_aname, p_refonly, p_search_dirs); assembly = _load_assembly_search(p_name, p_aname, p_refonly, p_search_dirs);
ERR_FAIL_NULL_V(assembly, nullptr); if (!assembly) {
return nullptr;
}
} }
GDMonoAssembly *loaded_asm = GDMono::get_singleton()->get_loaded_assembly(p_name); GDMonoAssembly *loaded_asm = GDMono::get_singleton()->get_loaded_assembly(p_name);
@ -481,7 +483,9 @@ GDMonoAssembly *GDMonoAssembly::load_from(const String &p_name, const String &p_
if (!assembly) { if (!assembly) {
assembly = _real_load_assembly_from(p_path, p_refonly); assembly = _real_load_assembly_from(p_path, p_refonly);
ERR_FAIL_NULL_V(assembly, NULL); if (!assembly) {
return nullptr;
}
} }
GDMonoAssembly *loaded_asm = GDMono::get_singleton()->get_loaded_assembly(p_name); GDMonoAssembly *loaded_asm = GDMono::get_singleton()->get_loaded_assembly(p_name);