From 318d0d93d517c9becb8c8fc855cc57693145e13f Mon Sep 17 00:00:00 2001
From: Dima Granetchi <system.grand@gmail.com>
Date: Fri, 21 Nov 2014 01:23:21 +0200
Subject: [PATCH] fix chain call

---
 src/bindx/BindxExt.hx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/bindx/BindxExt.hx b/src/bindx/BindxExt.hx
index 600a092..ff046b1 100644
--- a/src/bindx/BindxExt.hx
+++ b/src/bindx/BindxExt.hx
@@ -105,7 +105,7 @@ class BindExt {
             
             var type = Context.typeof(field.e).toComplexType();
             
-            var callPrev = macro $prevListenerNameExpr($a { prev.params != null ? [] : [macro null, macro n.$fieldName] } );
+            var callPrev = macro $prevListenerNameExpr($a { prev.params != null ? [] : [macro null, macro n != null ? n.$fieldName : null] } );
             if (prev.bindable) {
                 var unbind = BindMacros.bindingSignalProvider.getClassFieldUnbindExpr(valueExpr, prev.field, prevListenerNameExpr );
                 
@@ -114,13 +114,10 @@ class BindExt {
                 
                 fieldListenerBody.push(macro if ($valueExpr != null) $unbind );
                 fieldListenerBody.push(macro $valueExpr = n );
-                fieldListenerBody.push(macro if (n != null) {
-                    $ { BindMacros.bindingSignalProvider.getClassFieldBindExpr(macro n, prev.field, prevListenerNameExpr ) }
-                    $callPrev;
-                });
-            } else {
-                fieldListenerBody.push(macro if (n != null) $callPrev );
+                fieldListenerBody.push(macro if (n != null)
+                    $ { BindMacros.bindingSignalProvider.getClassFieldBindExpr(macro n, prev.field, prevListenerNameExpr ) });
             }
+            fieldListenerBody.push(callPrev);
         
             if (field.params != null) {
                 fieldListenerBody.unshift(macro var n:Null<$type> = try $e catch (e:Dynamic) null );