From 94607cab7f8d037c74c0301c863260066bcbbc99 Mon Sep 17 00:00:00 2001
From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com>
Date: Sun, 20 Oct 2024 11:11:43 +0200
Subject: [PATCH] Fix extern const struct merging

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

diff --git a/oscar64/Parser.cpp b/oscar64/Parser.cpp
index d5615d8..23896f5 100644
--- a/oscar64/Parser.cpp
+++ b/oscar64/Parser.cpp
@@ -691,13 +691,11 @@ Declaration* Parser::ParseStructDeclaration(uint64 flags, DecType dt, Declaratio
 
 		mScope = oscope;
 	}
-	else
-	{
-		if ((flags & ~dec->mFlags) == DTF_CONST)
-			dec = dec->ToConstType();
-		else if ((flags & ~dec->mFlags) == DTF_VOLATILE)
-			dec = dec->ToVolatileType();
-	}
+
+	if ((flags & ~dec->mFlags) == DTF_CONST)
+		dec = dec->ToConstType();
+	else if ((flags & ~dec->mFlags) == DTF_VOLATILE)
+		dec = dec->ToVolatileType();
 
 	return dec;
 }