From 2d8be0dff68dc4036bc6e8b5c40894f0367e6271 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 26 May 2022 21:51:40 +0300
Subject: [PATCH] Fixes

---
 .../Composition/Transport/BatchStreamArrayPool.cs          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs
index d76a9c609e..97d05704af 100644
--- a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs
@@ -51,11 +51,12 @@ internal abstract class BatchStreamPoolBase<T> : IDisposable
         {
             var maximumUsage = _usageStatistics.Max();
             var recentlyUsedPooledSlots = maximumUsage - _usage;
-            while (recentlyUsedPooledSlots < _pool.Count) 
+            var keepSlots = Math.Max(recentlyUsedPooledSlots, 10);
+            while (keepSlots < _pool.Count) 
                 DestroyItem(_pool.Pop());
 
-            _usageStatistics[_usageStatisticsSlot] = 0;
             _usageStatisticsSlot = (_usageStatisticsSlot + 1) % _usageStatistics.Length;
+            _usageStatistics[_usageStatisticsSlot] = 0;
         }
     }
 
@@ -137,7 +138,7 @@ internal sealed class BatchStreamMemoryPool : BatchStreamPoolBase<IntPtr>
 {
     public int BufferSize { get; }
 
-    public BatchStreamMemoryPool(int bufferSize = 16384, Action<Func<bool>>? startTimer = null) : base(true, startTimer)
+    public BatchStreamMemoryPool(int bufferSize = 1024, Action<Func<bool>>? startTimer = null) : base(true, startTimer)
     {
         BufferSize = bufferSize;
     }