From d70f969e8e779d3a94cd9f19a5af64952b1d304e Mon Sep 17 00:00:00 2001
From: Ryan Kurtz <ryanmkurtz@users.noreply.github.com>
Date: Mon, 22 Jun 2026 05:14:04 -0400
Subject: [PATCH] GP-6773: Fallback loader fix for batch importer

---
 .../java/ghidra/app/util/opinion/LoaderService.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LoaderService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LoaderService.java
index d6d7ab44d5..f52d023cad 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LoaderService.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LoaderService.java
@@ -58,10 +58,13 @@ public class LoaderService {
 			}
 		}
 
-		if (loaderMap.size() <= 1) { // BinaryLoader is always there
-			for (Loader loader : fallback) {
-				tryLoadSpecs(loader, provider, loaderMap);
-			}
+		// Only try fallback loaders if no other loaders matched (ignoring the BinaryLoader)
+		boolean matches = loaderMap.keySet()
+				.stream()
+				.map(Loader::getName)
+				.anyMatch(Predicate.not(BinaryLoader.BINARY_NAME::equals));
+		if (!matches) {
+			fallback.forEach(loader -> tryLoadSpecs(loader, provider, loaderMap));
 		}
 
 		return loaderMap;