yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-4-2-25'

Browse source
This commit is contained in:
Ryan Kurtz 2025-04-02 10:00:36 -04:00
commit 7f889d7812
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Ghidra/Features/Base/src/main/java/ghidra/app/merge/ProgramMultiUserMergeManager.java
View file

@ -16,6 +16,8 @@
package ghidra.app.merge;
import java.awt.*;
import java.util.ArrayList;
import java.util.List;
import javax.swing.*;
@ -33,6 +35,7 @@ import ghidra.app.util.ListingHighlightProvider;
import ghidra.app.util.viewer.util.FieldNavigator;
import ghidra.framework.model.DomainObject;
import ghidra.framework.plugintool.ModalPluginTool;
import ghidra.framework.plugintool.Plugin;
import ghidra.framework.plugintool.util.PluginException;
import ghidra.program.model.address.Address;
import ghidra.program.model.listing.Program;
@ -375,8 +378,12 @@ public class ProgramMultiUserMergeManager extends MergeManager {
if (!isShowingListingMergePanel) {
return;
}
mergePanel.removeDomainObjectListener();
mergeTool.removePlugins(java.util.List.of(listingPlugin, goToPlugin));
List<Plugin> list = new ArrayList<>();
list.add(listingPlugin);
list.add(goToPlugin);
mergeTool.removePlugins(list);
isShowingListingMergePanel = false;
mergePlugin.showDefaultComponent();
});