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

Merge pull request #41748 from neikeq/issue-41712 

Fix 'Parameter "assembly" is null' error
This commit is contained in:
Rémi Verschelde 2020-09-04 08:13:46 +02:00 committed by GitHub
parent 27763b67bb 136181bb50
commit d1b0b1962d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -464,7 +464,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);
@ -487,7 +489,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, 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);