From: Evan Nemerson <evan@coeus-group.com>
Date: Sat, 16 Oct 2010 07:57:35 +0000 (+0200)
Subject: codegen: Don't try to create a GClosure for null
X-Git-Tag: 0.11.1~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=341808e8f62ca78aab856dc01a0c51669883742f;p=thirdparty%2Fvala.git

codegen: Don't try to create a GClosure for null

Fixes bug 631269.
---

diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
index cceec7018..2aeca597b 100644
--- a/codegen/valaccodemethodcallmodule.vala
+++ b/codegen/valaccodemethodcallmodule.vala
@@ -364,7 +364,7 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
 									closure_new.add_argument (new CCodeCastExpression (cexpr, "GCallback"));
 									closure_new.add_argument (delegate_target);
 									closure_new.add_argument (delegate_target_destroy_notify);
-									cexpr = closure_new;
+									cexpr = new CCodeConditionalExpression (new CCodeBinaryExpression (CCodeBinaryOperator.EQUALITY, cexpr, new CCodeIdentifier ("NULL")), new CCodeIdentifier ("NULL"), closure_new);
 								} else {
 									carg_map.set (get_param_pos (param.cdelegate_target_parameter_position), delegate_target);
 									if (deleg_type.value_owned) {