Merge remote-tracking branch 'origin/patch'

ryanmkurtz · ryanmkurtz · commit a0205ff9606d · 2025-04-04T12:13:50.000-04:00
diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
@@ -404,11 +404,8 @@ private static Map<String, GModule> getOrderedModules(ApplicationLayout layout)
 			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.

Original file line number	Diff line number	Diff line change
`@@ -404,11 +404,8 @@ private static Map<String, GModule> getOrderedModules(ApplicationLayout layout)`
`404`	`404`	`if (external1 && external2) {`
`405`	`405`	`return nameComparison;`
`406`	`406`	`}`
`407`		`- if (external1) {`
`408`		`- return -1;`
`409`		`- }`
`410`		`- if (external2) {`
`411`		`- return 1;`
	`407`	`+ if (external1 \|\| external2) {`
	`408`	`+ return Boolean.compare(external1, external2);`
`412`	`409`	`}`
`413`	`410`
`414`	`411`	`// Now handle modules that are internal to the Ghidra installation.`