From cbacf99a61586e77b1ac62b7de7f53e3eb37b13e Mon Sep 17 00:00:00 2001
From: Brian Fiete <bfiete@gmail.com>
Date: Tue, 16 Jun 2020 07:50:00 -0700
Subject: [PATCH] Fixed erroneous tempaddr takeover in var decl

---
 IDEHelper/Compiler/BfStmtEvaluator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IDEHelper/Compiler/BfStmtEvaluator.cpp b/IDEHelper/Compiler/BfStmtEvaluator.cpp
index 61f86152..bba7233b 100644
--- a/IDEHelper/Compiler/BfStmtEvaluator.cpp
+++ b/IDEHelper/Compiler/BfStmtEvaluator.cpp
@@ -1546,7 +1546,7 @@ BfLocalVariable* BfModule::HandleVariableDeclaration(BfVariableDeclaration* varD
 			unresolvedType = initValue.mType;
 		resolvedType = unresolvedType;
 
-		if (initValue.IsTempAddr())
+		if ((initValue.IsTempAddr()) && (!localDef->mAddr) && (initValue.mType == resolvedType))
 		{
 			// Take over value
 			localDef->mAddr = initValue.mValue;