Fix code generation for destroy_notify calls for delegate targets

Fixes bug 615440.

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 91b14e338e796623b714de77c96f10550b237950..d76aefcaa8a4b01a4324775055ce0e577f00604d 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -2855,10 +2855,14 @@ internal class Vala.CCodeBaseModule : CCodeModule {
                        var ccall = new CCodeFunctionCall (delegate_target_destroy_notify);
                        ccall.add_argument (delegate_target);
 
+                       var destroy_call = new CCodeCommaExpression ();
+                       destroy_call.append_expression (ccall);
+                       destroy_call.append_expression (new CCodeConstant ("NULL"));
+
                        var cisnull = new CCodeBinaryExpression (CCodeBinaryOperator.EQUALITY, delegate_target_destroy_notify, new CCodeConstant ("NULL"));
 
                        var ccomma = new CCodeCommaExpression ();
-                       ccomma.append_expression (new CCodeConditionalExpression (cisnull, new CCodeConstant ("NULL"), ccall));
+                       ccomma.append_expression (new CCodeConditionalExpression (cisnull, new CCodeConstant ("NULL"), destroy_call));
                        ccomma.append_expression (new CCodeAssignment (cvar, new CCodeConstant ("NULL")));
                        ccomma.append_expression (new CCodeAssignment (delegate_target, new CCodeConstant ("NULL")));
                        ccomma.append_expression (new CCodeAssignment (delegate_target_destroy_notify, new CCodeConstant ("NULL")));