Fix generated code when mixing closures and simple lambda expressions

Fixes bug 615444.

diff --git a/codegen/valaccodedelegatemodule.vala b/codegen/valaccodedelegatemodule.vala
index 9a0c544e6c875d010bf284f6af38e62a97c3027f..b04ceee89e47546a94ca9334592e02d1248e5018 100644 (file)
--- a/codegen/valaccodedelegatemodule.vala
+++ b/codegen/valaccodedelegatemodule.vala
@@ -157,9 +157,9 @@ public class Vala.CCodeDelegateModule : CCodeArrayModule {
                        }
                        return invocation_expr.delegate_target;
                } else if (delegate_expr is LambdaExpression) {
-                       var closure_block = current_closure_block;
-                       if (closure_block != null) {
-                               int block_id = get_block_id (closure_block);
+                       var lambda = (LambdaExpression) delegate_expr;
+                       if (lambda.method.closure) {
+                               int block_id = get_block_id (current_closure_block);
                                var delegate_target = get_variable_cexpression ("_data%d_".printf (block_id));
                                if (expr_owned) {
                                        var ref_call = new CCodeFunctionCall (new CCodeIdentifier ("block%d_data_ref".printf (block_id)));