mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-10-23 13:41:04 +00:00
Merge remote-tracking branch 'origin/GP-3853-dragonmacher-vt-exception-fix-10.4' into Ghidra_10.4
This commit is contained in:
commit
2d424b4853
|
@ -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();
|
||||
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user