Merge remote-tracking branch 'origin/Ghidra_12.0'

This commit is contained in:
Ryan Kurtz
2025-11-19 10:50:54 -05:00
3 changed files with 10 additions and 6 deletions

View File

@@ -396,7 +396,10 @@ public class AppConfig {
String userSettingsDirName = appName + "_" + applicationVersion + "_" +
applicationReleaseName.replaceAll("\\s", "").toUpperCase();
if (isDev) {
userSettingsDirName += "_location_" + installDir.getParentFile().getName();
String dirName = new File(installDir, "ghidra.repos.config").isFile()
? installDir.getParentFile().getName()
: installDir.getName();
userSettingsDirName += "_location_" + dirName;
}
// Ensure there is a user home directory (there definitely should be)