Fix user platform override between armv7 and thumb

Only override the default platform based on the entry point architecture
in cases where the user didn't explicitly set loader.platform

1 files changed, 6 insertions, 2 deletions

diff --git a/view/elf/elfview.cpp b/view/elf/elfview.cpp
index c87c9e05..6d19bc5f 100644
--- a/view/elf/elfview.cpp
+++ b/view/elf/elfview.cpp
@@ -469,6 +469,7 @@ bool ElfView::Init()
 	m_extractMangledTypes = viewSettings->Get<bool>("analysis.extractTypesFromMangledNames", this);
 	m_simplifyTemplates = viewSettings->Get<bool>("analysis.types.templateSimplifier", this);
 
+	bool platformSetByUser = false;
 	Ref<Settings> settings = GetLoadSettings(GetTypeName());
 	if (settings)
 	{
@@ -477,11 +478,13 @@ bool ElfView::Init()
 
 		if (settings->Contains("loader.platform"))
 		{
-			Ref<Platform> platformOverride = Platform::GetByName(settings->Get<string>("loader.platform", this));
+			BNSettingsScope scope = SettingsAutoScope;
+			Ref<Platform> platformOverride = Platform::GetByName(settings->Get<string>("loader.platform", this, &scope));
 			if (platformOverride)
 			{
 				m_plat = platformOverride;
 				m_arch = m_plat->GetArchitecture();
+				platformSetByUser = (scope == SettingsResourceScope);
 			}
 		}
 	}
@@ -752,8 +755,9 @@ bool ElfView::Init()
 	GetParentView()->SetDefaultArchitecture(entryPointArch);
 
 	Ref<Platform> platform = m_plat ? m_plat : g_elfViewType->GetPlatform(m_ident.os, m_arch);
-	if (platform && (entryPointArch != m_arch))
+	if (platform && (entryPointArch != m_arch) && !platformSetByUser)
 		platform = platform->GetRelatedPlatform(entryPointArch);
+
 	if (!platform)
 		platform = entryPointArch->GetStandalonePlatform();