mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-05-20 04:33:30 -04:00
parent e28743e0da 988fe4f54e
commit 19e878936f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java
View File

@@ -322,7 +322,7 @@ public class PropertyListMergeManager implements MergeResolver {
Object myValue = getValue(myList, propertyName);
Object origValue = getValue(origList, propertyName);
if (!myValue.equals(origValue)) {
if (!Objects.equals(myValue, origValue)) {
setValue(resultList, propertyName, myList.getType(propertyName), myValue);
}