From 1335512648312125662303787867960394429749 Mon Sep 17 00:00:00 2001
From: Glenn Smith <glenn@vector35.com>
Date: Thu, 17 Jul 2025 14:23:14 -0400
Subject: Fix MachO loading some settings too early

Fixes #7117
---
 view/macho/machoview.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/view/macho/machoview.cpp b/view/macho/machoview.cpp
index dba8f9dc..339d9e06 100644
--- a/view/macho/machoview.cpp
+++ b/view/macho/machoview.cpp
@@ -203,10 +203,6 @@ MachoView::MachoView(const string& typeName, BinaryView* data, bool parseOnly):
 	Ref<BinaryViewType> universalViewType = BinaryViewType::GetByName("Universal");
 	bool isUniversal = (universalViewType && universalViewType->IsTypeValidForData(data));
 
-	Ref<Settings> viewSettings = Settings::Instance();
-	m_extractMangledTypes = viewSettings->Get<bool>("analysis.extractTypesFromMangledNames", data);
-	m_simplifyTemplates = viewSettings->Get<bool>("analysis.types.templateSimplifier", data);
-
 	Ref<Settings> settings = data->GetLoadSettings(typeName);
 	if (settings && settings->Contains("loader.macho.universalImageOffset"))
 	{
@@ -1096,6 +1092,10 @@ bool MachoView::Init()
 
 	SetOriginalImageBase(initialImageBase);
 	uint64_t preferredImageBase = initialImageBase;
+	Ref<Settings> viewSettings = Settings::Instance();
+	m_extractMangledTypes = viewSettings->Get<bool>("analysis.extractTypesFromMangledNames", this);
+	m_simplifyTemplates = viewSettings->Get<bool>("analysis.types.templateSimplifier", this);
+
 	bool platformSetByUser = false;
 	if (settings)
 	{
-- 
cgit v1.3.1