From 61c15860f0680fe81f50115a609837f1a2b8f5fc Mon Sep 17 00:00:00 2001
From: Ryan Kurtz <ryanmkurtz@users.noreply.github.com>
Date: Fri, 14 Feb 2025 05:49:22 -0500
Subject: [PATCH] GP-5381: Fixed a bug that prevented Ghidra from remembering
 the last-used JDK when the JAVA_HOME environment variable was set (Closes
 #7503)

---
 GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java b/GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java
index 36d6078c76..414e70fb03 100644
--- a/GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java
+++ b/GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java
@@ -202,6 +202,9 @@ public class LaunchSupport {
 		if (javaHome != null) {
 			javaHomeDir = new File(javaHome);
 			if (appConfig.isSupportedJavaHomeDir(javaHomeDir, javaFilter)) {
+				if (save) {
+					appConfig.saveJavaHome(javaHomeDir);
+				}
 				System.out.println(javaHomeDir);
 				return EXIT_SUCCESS;
 			}