From 039991da684187c5d64104ca310a14a6793b496f Mon Sep 17 00:00:00 2001
From: mstr2 <oxmyx@gmx.de>
Date: Wed, 13 Feb 2019 03:54:04 +0100
Subject: [PATCH] Fixed a bug where AddOwner would add a property to
 AvaloniaPropertyRegistry's property list more than once

---
 src/Avalonia.Base/AvaloniaPropertyRegistry.cs        | 12 ++++++++----
 .../AvaloniaPropertyRegistryTests.cs                 |  5 +++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaPropertyRegistry.cs b/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
index 6f57dfbf13..5fcdf76c0f 100644
--- a/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
+++ b/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
@@ -13,8 +13,8 @@ namespace Avalonia
     /// </summary>
     public class AvaloniaPropertyRegistry
     {
-        private readonly List<AvaloniaProperty> _properties =
-            new List<AvaloniaProperty>();
+        private readonly Dictionary<int, AvaloniaProperty> _properties =
+            new Dictionary<int, AvaloniaProperty>();
         private readonly Dictionary<Type, Dictionary<int, AvaloniaProperty>> _registered =
             new Dictionary<Type, Dictionary<int, AvaloniaProperty>>();
         private readonly Dictionary<Type, Dictionary<int, AvaloniaProperty>> _attached =
@@ -33,7 +33,7 @@ namespace Avalonia
         /// <summary>
         /// Gets a list of all registered properties.
         /// </summary>
-        internal IReadOnlyList<AvaloniaProperty> Properties => _properties;
+        internal IReadOnlyCollection<AvaloniaProperty> Properties => _properties.Values;
 
         /// <summary>
         /// Gets all non-attached <see cref="AvaloniaProperty"/>s registered on a type.
@@ -220,7 +220,11 @@ namespace Avalonia
                 inner.Add(property.Id, property);
             }
 
-            _properties.Add(property);
+            if (!_properties.ContainsKey(property.Id))
+            {
+                _properties.Add(property.Id, property);
+            }
+            
             _registeredCache.Clear();
         }
 
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
index 8220b7d6e7..d11319114f 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
@@ -27,6 +27,7 @@ namespace Avalonia.Base.UnitTests
             var property = new AttachedProperty<int>("test", typeof(object), metadata, true);
             registry.Register(typeof(object), property);
             registry.RegisterAttached(typeof(AvaloniaPropertyRegistryTests), property);
+            property.AddOwner<Class4>();
 
             Assert.Equal(1, registry.Properties.Count);
         }
@@ -150,5 +151,9 @@ namespace Avalonia.Base.UnitTests
         private class AttachedOwner2 : AttachedOwner
         {
         }
+
+        private class Class4 : AvaloniaObject
+        {
+        }
     }
 }