diff --git a/src/Avalonia.Base/AvaloniaPropertyRegistry.cs b/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
index 4806abac4d..0734b64721 100644
--- a/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
+++ b/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
@@ -448,11 +448,6 @@ namespace Avalonia
foreach (PropertyInitializationData data in initializationData)
{
- if (!data.Property.HasNotifyInitializedObservers)
- {
- continue;
- }
-
data.Property.NotifyInitialized(o);
}
}
diff --git a/src/Avalonia.Base/DirectPropertyBase.cs b/src/Avalonia.Base/DirectPropertyBase.cs
index 0b3747a374..a7d3f114bb 100644
--- a/src/Avalonia.Base/DirectPropertyBase.cs
+++ b/src/Avalonia.Base/DirectPropertyBase.cs
@@ -104,13 +104,16 @@ namespace Avalonia
///
internal override void NotifyInitialized(IAvaloniaObject o)
{
- var e = new AvaloniaPropertyChangedEventArgs(
- o,
- this,
- default,
- InvokeGetter(o),
- BindingPriority.Unset);
- NotifyInitialized(e);
+ if (HasNotifyInitializedObservers)
+ {
+ var e = new AvaloniaPropertyChangedEventArgs(
+ o,
+ this,
+ default,
+ InvokeGetter(o),
+ BindingPriority.Unset);
+ NotifyInitialized(e);
+ }
}
///
diff --git a/src/Avalonia.Base/StyledPropertyBase.cs b/src/Avalonia.Base/StyledPropertyBase.cs
index bbb47d63ad..d842638e57 100644
--- a/src/Avalonia.Base/StyledPropertyBase.cs
+++ b/src/Avalonia.Base/StyledPropertyBase.cs
@@ -141,13 +141,16 @@ namespace Avalonia
///
internal override void NotifyInitialized(IAvaloniaObject o)
{
- var e = new AvaloniaPropertyChangedEventArgs(
- o,
- this,
- default,
- o.GetValue(this),
- BindingPriority.Unset);
- NotifyInitialized(e);
+ if (HasNotifyInitializedObservers)
+ {
+ var e = new AvaloniaPropertyChangedEventArgs(
+ o,
+ this,
+ default,
+ o.GetValue(this),
+ BindingPriority.Unset);
+ NotifyInitialized(e);
+ }
}
///