Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 03:07:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1897_ghidravore_datatype_tree_filter_not_applied_when_opening_program--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz
2022-04-06 15:26:56 -04:00
parent 86241b4d22 06dddaea18
commit a27f56eba5
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java
+7 -4
View File
@@ -1236,10 +1236,13 @@ public class GTree extends JPanel implements BusyListener {
* @param newNode the node that may cause the tree to refilter. * @param newNode the node that may cause the tree to refilter.
*/ */
public void refilterLater(GTreeNode newNode) { public void refilterLater(GTreeNode newNode) {
if (isFilteringEnabled && filter != null) { if (!isFilteringEnabled || filter == null) {
if (filter.acceptsNode(newNode)) { return;
filterUpdateManager.updateLater(); }
}
// non-leaf nodes may have children that would require filtering
if (!newNode.isLeaf() || filter.acceptsNode(newNode)) {
filterUpdateManager.updateLater();
} }
} }