Merge pull request AvaloniaUI#3258 from AvaloniaUI/fixes/binding-stac…

…k-overflow Alternative fix for binding stack overflow
donandren · Nov 15, 2019 · c5acd37 · c5acd37
2 parents b8717bf + 49b91d1
commit c5acd37
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 132 deletions.
diff --git a/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs b/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Avalonia.Data;
 
 #nullable enable
@@ -47,8 +48,14 @@ private void PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
         {
             if (e.Property == _property)
             {
-                _value = (T)e.NewValue;
-                PublishNext(new BindingValue<T>(_value));
+                var typedArgs = (AvaloniaPropertyChangedEventArgs<T>)e;
+                var newValue = e.Sender.GetValue(typedArgs.Property);
+
+                if (!typedArgs.OldValue.HasValue || !EqualityComparer<T>.Default.Equals(newValue, _value))
+                {
+                    _value = newValue;
+                    PublishNext(_value);
+                }
             }
         }
     }

diff --git a/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs b/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs
@@ -44,8 +44,13 @@ private void PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
         {
             if (e.Property == _property)
             {
-                _value = (T)e.NewValue;
-                PublishNext(_value);
+                var newValue = e.Sender.GetValue(e.Property);
+
+                if (!Equals(newValue, _value))
+                {
+                    _value = (T)newValue;
+                    PublishNext(_value);
+                }
             }
         }
     }

diff --git a/src/Avalonia.Base/Utilities/DeferredSetter.cs b/src/Avalonia.Base/Utilities/DeferredSetter.cs