From 32d9bb6cedfb2bf9f6c9bddfa9716427ceb0fc0d Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 2 Oct 2019 23:23:12 +0200
Subject: [PATCH] codegen: Preserve full access to delegate variables and its
 target/destroy cvalues

Don't unconditionally set delegate_target_destroy_notify_cvalue to NULL for any
variable access.
---
 codegen/valaccodememberaccessmodule.vala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codegen/valaccodememberaccessmodule.vala b/codegen/valaccodememberaccessmodule.vala
index 8e546878e..24e0cedf8 100644
--- a/codegen/valaccodememberaccessmodule.vala
+++ b/codegen/valaccodememberaccessmodule.vala
@@ -735,9 +735,9 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
 		} else if (delegate_type != null) {
 			if (!get_ccode_delegate_target (variable)) {
 				result.delegate_target_cvalue = new CCodeConstant ("NULL");
+				result.delegate_target_destroy_notify_cvalue = new CCodeConstant ("NULL");
 			}
 
-			result.delegate_target_destroy_notify_cvalue = new CCodeConstant ("NULL");
 			result.lvalue = false;
 		}
 		result.value_type.value_owned = false;
-- 
2.47.2