From a0215a4f21221341dd2481965c0c2528bd74f270 Mon Sep 17 00:00:00 2001
From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com>
Date: Wed, 14 May 2025 15:15:24 +0200
Subject: [PATCH] Add fix for template overload with multiple includes

---
 oscar64/Parser.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/oscar64/Parser.cpp b/oscar64/Parser.cpp
index 8de9c9e..f4ec825 100644
--- a/oscar64/Parser.cpp
+++ b/oscar64/Parser.cpp
@@ -12051,7 +12051,12 @@ void Parser::ParseTemplateDeclarationBody(Declaration * tdec, Declaration * pthi
 				pdec = pdec->mNext;
 			}
 
-			if (pdec && pdec->mTemplate)
+			if (!pdec)
+			{
+				ppdec->mNext = tdec->mBase;
+				tdec->mBase->mNext = nullptr;
+			}
+			else if (pdec->mTemplate)
 			{
 				tdec->mNext = pdec->mTemplate->mNext;
 				pdec->mTemplate->mNext = tdec;