Skip to content

Commit 5b452a4

Browse files
Remove SpriteVisual from tree before disposing of resources
Remove SpriteVisual before disposing of resources
1 parent 4ed6d12 commit 5b452a4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

components/Extensions/src/Shadows/AttachedShadowBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ protected internal virtual void OnElementContextInitialized(AttachedShadowElemen
161161
/// <param name="context">The <see cref="AttachedShadowElementContext"/> that is being uninitialized.</param>
162162
protected internal virtual void OnElementContextUninitialized(AttachedShadowElementContext context)
163163
{
164-
context.ClearAndDisposeResources();
165164
ElementCompositionPreview.SetElementChildVisual(context.Element, null!);
165+
context.ClearAndDisposeResources();
166166
}
167167

168168
/// <inheritdoc/>

components/Extensions/src/Shadows/AttachedShadowElementContext.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,12 @@ private void Uninitialize()
135135

136136
IsInitialized = false;
137137

138+
if (Element != null)
139+
{
140+
ElementCompositionPreview.SetElementChildVisual(Element, null!);
141+
Element.SizeChanged -= OnElementSizeChanged;
142+
}
143+
138144
Parent.OnElementContextUninitialized(this);
139145

140146
if (SpriteVisual != null)
@@ -148,12 +154,6 @@ private void Uninitialize()
148154
Shadow.Dispose();
149155
}
150156

151-
if (Element != null)
152-
{
153-
ElementCompositionPreview.SetElementChildVisual(Element, null!);
154-
Element.SizeChanged -= OnElementSizeChanged;
155-
}
156-
157157
SpriteVisual = null;
158158
Shadow = null;
159159
ElementVisual = null;

0 commit comments

Comments
 (0)