Browse Source

Merge pull request #41749 from neikeq/3.2-issue-41712

[3.2] Fix 'Parameter "assembly" is null' error
Rémi Verschelde 5 years ago
parent
commit
fba07e75e6
1 changed files with 6 additions and 2 deletions
  1. 6 2
      modules/mono/mono_gd/gd_mono_assembly.cpp

+ 6 - 2
modules/mono/mono_gd/gd_mono_assembly.cpp

@@ -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);