Skip to content

Commit 231745e

Browse files
authored
Merge pull request #1035 from mpondo/FixMissingNullCheck
Add missing null checks to Bind
2 parents 6a440a4 + 90377ac commit 231745e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Caliburn.Micro.Platform/Bind.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public static void SetModel(DependencyObject dependencyObject, object value)
134134

135135
static void ModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
136136
{
137-
if (View.InDesignMode || object.ReferenceEquals(e.NewValue, e.OldValue))
137+
if (View.InDesignMode || e.NewValue == null || object.ReferenceEquals(e.NewValue, e.OldValue))
138138
{
139139
return;
140140
}
@@ -165,7 +165,7 @@ static void ModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs
165165

166166
static void ModelWithoutContextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
167167
{
168-
if (View.InDesignMode || object.ReferenceEquals(e.NewValue, e.OldValue))
168+
if (View.InDesignMode || e.NewValue == null || object.ReferenceEquals(e.NewValue, e.OldValue))
169169
{
170170
return;
171171
}

0 commit comments

Comments
 (0)