Check enumerator index (#226)

drasticactions · Mar 5, 2025 · 86f6553 · 86f6553
1 parent c8100e1
commit 86f6553
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/FishyFlip/ATObjectCollectionAsyncEnumerator{T}.cs b/src/FishyFlip/ATObjectCollectionAsyncEnumerator{T}.cs
@@ -60,8 +60,16 @@ public async ValueTask<bool> MoveNextAsync()
         if (this.Collection.HasMoreItems)
         {
             await this.Collection.GetMoreItemsAsync(cancellationToken: this.cancellationToken);
-            this.index++;
-            return true;
+
+            // Need to verify that new items were added with GetMoreItemsAsync to increase the index,
+            // otherwise it will throw on an out of range index.
+            if (this.index + 1 < this.Collection.Count)
+            {
+                this.index++;
+                return true;
+            }
+
+            return this.Collection.HasMoreItems;
         }
 
         return false;