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

Merge remote-tracking branch 'origin/GP-3853-dragonmacher-vt-exception-fix-10.4' into Ghidra_10.4

Browse Source
This commit is contained in:
Ryan Kurtz
2023-09-20 11:50:08 -04:00
parent 0f34531943 c94c85157b
commit 2d424b4853
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/matchtable/VTMatchTableProvider.java
View File

@@ -229,6 +229,10 @@ public class VTMatchTableProvider extends ComponentProviderAdapter
private VTMatchTableModel createTableModel() {
matchesTableModel = new VTMatchTableModel(controller);
matchesTableModel.addTableModelListener(e -> {
if (matchesTable == null) {
return; // we've been disposed
}
int filteredCount = matchesTableModel.getRowCount();
int unfilteredCount = matchesTableModel.getUnfilteredRowCount();

8
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/onetomany/VTMatchOneToManyTableProvider.java
View File

@@ -168,6 +168,10 @@ public abstract class VTMatchOneToManyTableProvider extends ComponentProviderAda
protected GhidraTable initializeMatchesTable() {
oneToManyTableModel = getMatchesTableModel();
oneToManyTableModel.addTableModelListener(e -> {
if (matchesTable == null) {
return; // we've been disposed
}
if (pendingMatchSelection != null) {
setSelectedMatch(pendingMatchSelection);
}
@@ -235,7 +239,7 @@ public abstract class VTMatchOneToManyTableProvider extends ComponentProviderAda
int row = oneToManyTableModel.getRowIndex(match);
if (row < 0) {
pendingMatchSelection = match;
// this happen while reloading. If so, save the match and listen for
// this happen while reloading. If so, save the match and listen for
// the table data changed and restore the selection at that point
return;
}
@@ -469,7 +473,7 @@ public abstract class VTMatchOneToManyTableProvider extends ComponentProviderAda
//==================================================================================================
// FilterDialogModel Methods
//==================================================================================================
//==================================================================================================
@Override
public void addFilter(Filter<VTMatch> filter) {