From e3db26004b85c591b1fea24269b75904f03f198e Mon Sep 17 00:00:00 2001
From: Brian Fiete <bfiete@gmail.com>
Date: Thu, 24 Jun 2021 06:59:29 -0700
Subject: [PATCH] Heap fix

---
 BeefySysLib/util/Heap.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BeefySysLib/util/Heap.cpp b/BeefySysLib/util/Heap.cpp
index be7f8228..e4ba2ac7 100644
--- a/BeefySysLib/util/Heap.cpp
+++ b/BeefySysLib/util/Heap.cpp
@@ -180,10 +180,10 @@ ContiguousHeap::AllocRef ContiguousHeap::Alloc(int size)
 			if (block->mKind == ChBlockKind_Merged)
 			{
 				itr--;
-				if (mFreeIdx >= mFreeList.mSize)
-					mFreeIdx = 0;
 				block->mKind = (ChBlockKind)0;
 				mFreeList.RemoveAtFast(mFreeIdx);
+				if (mFreeIdx >= mFreeList.mSize)
+					mFreeIdx = 0;
 				continue;
 			}