Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 19:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4948_dev747368_fix_encodedstrings_dlg_error' into Ghidra_11.2

Browse Source
This commit is contained in:
Ryan Kurtz 2024-09-20 16:39:36 -04:00
commit e447011186
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/EncodedStringsDialog.java
View File

@ -366,7 +366,7 @@ public class EncodedStringsDialog extends DialogComponentProvider {
tableModel = new EncodedStringsTableModel(program, selectedAddresses); tableModel = new EncodedStringsTableModel(program, selectedAddresses);
tableModel.addTableModelListener(e -> { tableModel.addTableModelListener(e -> {
Integer rowNum = rowToSelect.getAndSet(null); Integer rowNum = rowToSelect.getAndSet(null);
if (rowNum != null) { if (rowNum != null && rowNum < tableModel.getRowCount()) {
table.selectRow(rowNum); table.selectRow(rowNum);
table.requestFocusInWindow(); table.requestFocusInWindow();
} }
@ -848,7 +848,7 @@ public class EncodedStringsDialog extends DialogComponentProvider {
int rowCount = table.getRowCount(); int rowCount = table.getRowCount();
int selectedRowCount = table.getSelectedRowCount(); int selectedRowCount = table.getSelectedRowCount();
setCreateButtonInfo(rowCount, selectedRowCount); setCreateButtonInfo(rowCount, selectedRowCount);
if (selectedRowCount == 1) { if (selectedRowCount == 1 && tableModel.getProgram() != null) {
int[] selectedRows = table.getSelectedRows(); int[] selectedRows = table.getSelectedRows();
table.navigate(selectedRows[0], 0 /* location col */); table.navigate(selectedRows[0], 0 /* location col */);
} }