From d30fafb702b6708c783b8b7739dfa73868c6416c Mon Sep 17 00:00:00 2001
From: Hunter Bridges <775593+hunterbridges@users.noreply.github.com>
Date: Wed, 21 Sep 2022 11:58:51 -0700
Subject: [PATCH] Field resolution compiler crash fix

---
 IDEHelper/Compiler/BfExprEvaluator.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/IDEHelper/Compiler/BfExprEvaluator.cpp b/IDEHelper/Compiler/BfExprEvaluator.cpp
index 9c40d1d2..6678b989 100644
--- a/IDEHelper/Compiler/BfExprEvaluator.cpp
+++ b/IDEHelper/Compiler/BfExprEvaluator.cpp
@@ -5000,7 +5000,12 @@ BfTypedValue BfExprEvaluator::LoadField(BfAstNode* targetSrc, BfTypedValue targe
 	{
 		if ((fieldInstance->mResolvedType == NULL) ||
 			(!fieldDef->mIsStatic))
+		{
 			mModule->PopulateType(typeInstance, BfPopulateType_Data);
+
+			// Update fieldInstance pointer as it may have moved
+			fieldInstance = &typeInstance->mFieldInstances[fieldDef->mIdx];
+		}
 	}
 
 	if (fieldInstance->mResolvedType == NULL)