From 2d77356c7a4492316b8d6a1fd2b7c727a6f98622 Mon Sep 17 00:00:00 2001 From: jogibear9988 Date: Mon, 29 Dec 2014 14:02:58 +0100 Subject: [PATCH 1/2] GitIgnore Vs2015 Files --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 1d2ebb26f2..d65d9d2e06 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,10 @@ bin/ /src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib /packages/ /src/Tools/ResGet/*.log + + +*.ide/ +*.sdsettings +*.DotSettings.user +*.suo +.DS_Store \ No newline at end of file From 37d34713bf8942db147d0abb547b0b3fdea64179 Mon Sep 17 00:00:00 2001 From: jogibear9988 Date: Mon, 29 Dec 2014 14:11:35 +0100 Subject: [PATCH 2/2] Null Ref fix --- .../WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs index d408c95746..b4be953816 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs @@ -203,8 +203,10 @@ namespace ICSharpCode.WpfDesign.XamlDom ResetInternal(); propertyValue = value; - propertyValue.ParentProperty = this; - propertyValue.AddNodeTo(this); + if (propertyValue != null) { + propertyValue.ParentProperty = this; + propertyValue.AddNodeTo(this); + } UpdateValueOnInstance(); ParentObject.OnPropertyChanged(this);