From e80f9812ef3915a3a60123f758d3aeb7fdcd9d7e Mon Sep 17 00:00:00 2001
From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com>
Date: Fri, 20 Sep 2024 19:22:12 +0200
Subject: [PATCH] Fix invalid destruct on shortcut evaluation

---
 oscar64/Parser.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/oscar64/Parser.cpp b/oscar64/Parser.cpp
index cd05e3e..dd400e3 100644
--- a/oscar64/Parser.cpp
+++ b/oscar64/Parser.cpp
@@ -3865,6 +3865,11 @@ Expression* Parser::AddFunctionCallRefReturned(Expression* exp)
 			}
 		}
 	}
+	else if (exp->mType == EX_LOGICAL_AND || exp->mType == EX_LOGICAL_OR)
+	{
+		lexp = AddFunctionCallRefReturned(exp->mLeft);
+		exp->mRight = CleanupExpression(exp->mRight);
+	}
 	else
 	{
 		if (exp->mLeft)