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

Merge remote-tracking branch

Browse Source 
'origin/GP-1074_ryanmkurtz_PR-2742_marcushall42_null-script' into patch
(Closes #2742)
This commit is contained in:
ghidra1 2021-06-25 14:34:05 -04:00
commit 884303c23d
1 changed files with 3 additions and 1 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/script/GhidraScriptComponentProvider.java
View File

@ -612,7 +612,9 @@ public class GhidraScriptComponentProvider extends ComponentProviderAdapter {
void runScript(ResourceFile scriptFile, TaskListener listener) {
lastRunScript = scriptFile;
GhidraScript script = doGetScriptInstance(scriptFile);
doRunScript(script, listener);
if (script != null) {
doRunScript(script, listener);
}
}
private GhidraScript doGetScriptInstance(ResourceFile scriptFile) {