Browse Source

unbreak lazy initialization of Values

pull/2900/head
ahopper 7 years ago
parent
commit
4d8973226d
  1. 8
      src/Avalonia.Base/AvaloniaObject.cs

8
src/Avalonia.Base/AvaloniaObject.cs

@ -599,9 +599,9 @@ namespace Avalonia
private object GetValueOrDefaultUnchecked(AvaloniaProperty property)
{
var aobj = this;
if (aobj.Values != null)
if (aobj._values != null)
{
var result = aobj.Values.GetValue(property);
var result = aobj._values.GetValue(property);
if (result != AvaloniaProperty.UnsetValue)
{
return result;
@ -612,9 +612,9 @@ namespace Avalonia
while(aobj.InheritanceParent is AvaloniaObject parent)
{
aobj = parent;
if (aobj.Values != null)
if (aobj._values != null)
{
var result = aobj.Values.GetValue(property);
var result = aobj._values.GetValue(property);
if (result != AvaloniaProperty.UnsetValue)
{
return result;

Loading…
Cancel
Save