From cee2cb3b44484a5c8ac7bc593f502b2fbc92d3d4 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Fri, 4 Apr 2025 12:02:39 -0400 Subject: [PATCH] GP-5569: Fixing an issue with external extension classpath order --- .../Utility/src/main/java/ghidra/GhidraLauncher.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java index d792b2c1ab..5633f89b86 100644 --- a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java +++ b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java @@ -404,11 +404,8 @@ public class GhidraLauncher { if (external1 && external2) { return nameComparison; } - if (external1) { - return -1; - } - if (external2) { - return 1; + if (external1 || external2) { + return Boolean.compare(external1, external2); } // Now handle modules that are internal to the Ghidra installation.