From 949d8d64ba625cc68dcb2c8a73560ce5e6aab107 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Fri, 26 Feb 2016 09:12:26 +0100
Subject: [PATCH] add LogicalParent null test for getDataSource

---
 src/GraphicObjects/GraphicObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index be2bf0e7..d0219b15 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -434,7 +434,7 @@ namespace Crow
 					this.ResolveBindings();
 			}
 			get {				
-				return dataSource == null ? 
+				return dataSource == null ? LogicalParent == null ? null :
 					(LogicalParent as GraphicObject).DataSource : dataSource;
 			}
 		}
-- 
2.47.3