Merge branch 'master' into TCCUseTwoPresenters

3 years ago · b26f9ea4e2
1 changed files with 3 additions and 1 deletions
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@ -128,7 +128,9 @@ namespace Avalonia.Rendering.Composition.Server

            if (_renderTarget?.IsCorrupted == true)
            {
-                _renderTarget!.Dispose();
+                _layer?.Dispose();
+                _layer = null;
+                _renderTarget.Dispose();
                _renderTarget = null;
                _redrawRequested = true;
            }