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

fix script action persistence ("in tool" state save/restore)

Browse Source
This commit is contained in:
Jason P. Leasure 2020-10-26 14:48:23 -04:00
parent 60370df094
commit 7bd8e0fed9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptActionManager.java
View File

@ -110,9 +110,13 @@ class GhidraScriptActionManager {
void restoreScriptsThatAreInTool(SaveState saveState) {
String[] array = saveState.getStrings(SCRIPT_ACTIONS_KEY, new String[0]);
for (String filename : array) {
ScriptInfo info = infoManager.findScriptInfoByName(filename);
if (info != null) { // the file may have been deleted from disk
provider.getActionManager().createAction(info.getSourceFile());
ResourceFile file = generic.util.Path.fromPathString(filename);
if (file.exists()) {
// restore happens early -- the next call will create a new ScriptInfo
ScriptInfo info = infoManager.getScriptInfo(file);
if (info != null) {
createAction(info.getSourceFile());
}
}
else {
Msg.info(this, "Cannot find script for keybinding: '" + filename + "'");
@ -159,7 +163,7 @@ class GhidraScriptActionManager {
Set<ResourceFile> actionScriptFiles = actionMap.keySet();
Set<String> scriptPaths = new HashSet<>(actionScriptFiles.size());
for (ResourceFile file : actionScriptFiles) {
scriptPaths.add(file.getName());
scriptPaths.add(generic.util.Path.toPathString(file));
}
String[] array = scriptPaths.toArray(new String[scriptPaths.size()]);