Merge remote-tracking branch 'origin/patch'

This commit is contained in:
Ryan Kurtz 2022-12-28 09:02:06 -05:00
commit 55124ff249
120 changed files with 920 additions and 932 deletions

View file

@ -39,7 +39,7 @@ import ghidra.framework.store.db.PackedDatabase;
import ghidra.util.Msg;
import ghidra.util.filechooser.ExtensionFileFilter;
import ghidra.util.layout.PairLayout;
import ghidra.util.task.TaskMonitorAdapter;
import ghidra.util.task.TaskMonitor;
import utility.application.ApplicationLayout;
/**
@ -133,9 +133,9 @@ public class DbViewer extends JFrame {
}
catch (IOException e) {
try {
PackedDatabase pdb = PackedDatabase.getPackedDatabase(selectedFile,
TaskMonitorAdapter.DUMMY_MONITOR);
dbh = pdb.open(TaskMonitorAdapter.DUMMY_MONITOR);
PackedDatabase pdb =
PackedDatabase.getPackedDatabase(selectedFile, TaskMonitor.DUMMY);
dbh = pdb.open(TaskMonitor.DUMMY);
tables = dbh.getTables();
Arrays.sort(tables, new TableNameComparator());
}