瀏覽代碼

Merge pull request #18792 from PJB3005/18-05-11-objectdb-verbose-mono

Fixes ObjectDB leak printout with mono.
Rémi Verschelde 7 年之前
父節點
當前提交
6e32a2886f
共有 1 個文件被更改,包括 6 次插入0 次删除
  1. 6 0
      modules/mono/csharp_script.cpp

+ 6 - 0
modules/mono/csharp_script.cpp

@@ -1732,6 +1732,12 @@ void CSharpScript::_clear() {
 
 Variant CSharpScript::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
 
+	if (unlikely(GDMono::get_singleton() == NULL)) {
+		// Probably not the best error but eh.
+		r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		return Variant();
+	}
+
 	GDMonoClass *top = script_class;
 
 	while (top && top != native) {