From 3d9ef67c493144dbacb4347c487bce36ee77e5dd Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 1 Jun 2023 15:42:51 +0600
Subject: [PATCH 1/2] Fixed _requestedCommits enumeration

---
 src/Avalonia.Base/Media/MediaContext.Compositor.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Media/MediaContext.Compositor.cs b/src/Avalonia.Base/Media/MediaContext.Compositor.cs
index 9bdd77960d..4ddc2ea9eb 100644
--- a/src/Avalonia.Base/Media/MediaContext.Compositor.cs
+++ b/src/Avalonia.Base/Media/MediaContext.Compositor.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Platform;
 using Avalonia.Rendering.Composition;
@@ -78,7 +79,7 @@ partial class MediaContext
             // Nothing to do, and there are no pending commits
             return false;
         
-        foreach (var c in _requestedCommits)
+        foreach (var c in _requestedCommits.ToArray())
             CommitCompositor(c);
         
         _requestedCommits.Clear();

From 685682c5dba9ae69afd8a36215ad5ebd013b037b Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 1 Jun 2023 15:43:15 +0600
Subject: [PATCH 2/2] Fixed race condition in Compositor.Commit

---
 src/Avalonia.Base/Rendering/Composition/Compositor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Base/Rendering/Composition/Compositor.cs b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
index dde9dcd6fb..5838811e9e 100644
--- a/src/Avalonia.Base/Rendering/Composition/Compositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
@@ -130,7 +130,7 @@ namespace Avalonia.Rendering.Composition
             Dispatcher.UIThread.VerifyAccess();
             using var noPump = NonPumpingLockHelper.Use();
             
-            _nextCommit ??= new();
+            var commit = _nextCommit ??= new();
 
             (_invokeBeforeCommitRead, _invokeBeforeCommitWrite) = (_invokeBeforeCommitWrite, _invokeBeforeCommitRead);
             while (_invokeBeforeCommitRead.Count > 0)
@@ -188,7 +188,7 @@ namespace Avalonia.Rendering.Composition
                 }, TaskContinuationOptions.ExecuteSynchronously);
                 _nextCommit = null;
                 
-                return _pendingBatch;
+                return commit;
             }
         }