mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-05 10:49:34 +02:00
Merge remote-tracking branch
'origin/GP-5440_ghidragon_fixing_nav_history_when_repeating_mem_search' (Closes #7445)
This commit is contained in:
commit
1e18516eb5
3 changed files with 9 additions and 1 deletions
|
@ -457,4 +457,8 @@ class MemorySearchControlPanel extends JPanel {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Component getDefaultFocusComponent() {
|
||||||
|
return searchInputField;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -231,13 +231,16 @@ public class MemorySearchPlugin extends Plugin implements MemorySearchService {
|
||||||
if (match != null) {
|
if (match != null) {
|
||||||
lastSearchAddress = match.getAddress();
|
lastSearchAddress = match.getAddress();
|
||||||
Program program = navigatable.getProgram();
|
Program program = navigatable.getProgram();
|
||||||
navigatable.goTo(program, new BytesFieldLocation(program, match.getAddress()));
|
GoToService service = tool.getService(GoToService.class);
|
||||||
|
service.goTo(navigatable, new BytesFieldLocation(program, match.getAddress()),
|
||||||
|
program);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Msg.showWarn(this, null, "Match Not Found",
|
Msg.showWarn(this, null, "Match Not Found",
|
||||||
"No match found going forward for " + lastByteMatcher.getInput());
|
"No match found going forward for " + lastByteMatcher.getInput());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setShowOptionsPanel(boolean show) {
|
public void setShowOptionsPanel(boolean show) {
|
||||||
|
|
|
@ -139,6 +139,7 @@ public class MemorySearchProvider extends ComponentProviderAdapter
|
||||||
setVisible(true);
|
setVisible(true);
|
||||||
|
|
||||||
createActions(plugin.getName());
|
createActions(plugin.getName());
|
||||||
|
setDefaultFocusComponent(searchPanel.getDefaultFocusComponent());
|
||||||
|
|
||||||
tool.addContextListener(this);
|
tool.addContextListener(this);
|
||||||
navigatable.addNavigatableListener(this);
|
navigatable.addNavigatableListener(this);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue