mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-08-08 07:40:39 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-7118-dragonmacher-comp-editor-fix' into patch (Closes #9461)
This commit is contained in:
Ryan Kurtz
2026-08-07 07:11:42 -04:00
parent c09c056438 9734de71f9
commit c42f398414
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorModel.java
View File

@@ -57,7 +57,7 @@ public abstract class CompEditorModel<T extends Composite> extends CompositeEdit
public void load(T dataType) {
if (dataType.isDeleted()) {
// This can occur when mayny events get lumped together and a change event triggers
// This can occur when many events get lumped together and a change event triggers
// a delayed reload prior to datatype removal and its event
if (dataType == originalComposite) {
// Re-route to dataTypeRemoved callback after restoring listener.
@@ -884,7 +884,7 @@ public abstract class CompEditorModel<T extends Composite> extends CompositeEdit
throw new UnsupportedOperationException();
}
// TODO: May need special logic if dtc is zero-length component
// Note: May need special logic if dtc is zero-length component
int length = getLength();
int nextCompOffset = dtc.getEndOffset() + 1;
if (nextCompOffset >= length) {
@@ -1513,8 +1513,7 @@ public abstract class CompEditorModel<T extends Composite> extends CompositeEdit
}
else {
Composite changedComposite = getOriginalComposite();
if ((changedComposite != null) &&
!viewComposite.isEquivalent(changedComposite)) {
if (changedComposite != null) {
originalDTM.removeDataTypeManagerListener(this);
originalDTM.flushEvents();
Swing.runLater(() -> load(getOriginalComposite()));