Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-7347 - Fixed a bug when double-clicking a project archive in the Front End

dragonmacher1fce00a860c9
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/ActiveDataTypeStores.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/ActiveDataTypeStores.java
index 67143d1685..cd0be77fed 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/ActiveDataTypeStores.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/ActiveDataTypeStores.java
@@ -147,7 +147,8 @@ class ActiveDataTypeStores {
if (openedDf instanceof DomainFileProxy proxy) {
openedDf = proxy.getOriginalDomainFile();
}
- if (openedVersion == version && domainFile.equals(openedDf)) {
+
+ if (domainFile.equals(openedDf) && isCorrectVersion(openedVersion, version)) {
return projectArchive;
}
}
@@ -155,6 +156,16 @@ class ActiveDataTypeStores {
return null;
}
+ private boolean isCorrectVersion(int openedVersion, int requestedVersion) {
+
+ if (openedVersion == requestedVersion) {
+ return true;
+ }
+
+ // see if we are asking for the current version
+ return requestedVersion == DomainFile.DEFAULT_VERSION;
+ }
+
FileDataTypeArchive getArchiveForFile(ResourceFile file) {
for (PersistentDataTypeArchive archive : openArchives) {
if (archive instanceof FileDataTypeArchive fileArchive) {